Commit Graph

909 Commits

Author SHA1 Message Date
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
killer653
55c8c8a6fb Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	icons/mob/human_races/markings_vr.dmi
2017-12-17 04:06:35 -05:00
Spades
82a351efc7 Merge pull request #2556 from Verkister/markenings
Some markings tweaks and such.
2017-12-16 08:29:49 -05:00
killer653
b91a3c0ea7 Chirret Edits 2017-12-15 19:31:42 -05:00
killer653
7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
Verkister
1b165c36a3 Some markings tweaks and such.
-Fixes the side view arms on cow body markings.
-Adds the wider sorta sergal base eyes as markings (for custom species etc)
-Adds vulp snout stripe marking (like the vulpine facial without the rest of snout)
-Adjusts teshari hair highlights to better match our multiply body hair stuff.
2017-12-09 11:15:12 +02:00
Cameron Lennox
755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
mistyLuminescence
396b2c78e7 Removes bad meme from hairstyle code 2017-11-06 14:38:37 +00:00
killer653
7a3bf3cd89 More edits 2017-11-04 13:45:26 -04:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background
Ports the background icons for char setup
2017-10-30 20:35:55 -04:00
Spades
fa38bec798 Merge pull request #2382 from Verkister/hairrevolution
It's time for hair color revolution!
2017-10-30 13:56:11 -04:00
Verkister
404ac0f42c It's time for hair color revolution here too!
-Aye greetings from downstream hell where I managed to solve the locally intense ADD vs MULTIPLY blend mode discource once and for all with a fresh as hell new option that combines the best of both worlds without the downsides.
-You can now have hairstyles that retain both, shading and highlights in every color how cool is that?
-Got told to port this stuff up here too so you're welcome. Spread the word if ya want. Planning to hit up the other blend stuffs as well some time, but here's a little something for now.
2017-10-28 17:00:21 +03:00
Anewbe
c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
Verkister
d879d481d7 It's time for hair color revolution!
-I SOMEHOW FIGURED OUT A COMBO BLEND THAT COMBINES THE BEST OF BOTH, ADD AND MULTIPLY AND LOOKING GOOD AT ALL COLORS IN LESS THAN AN HOUR AAAAAAAA!
-IMPOSSIBILITIES MY ARSE I AM GOD HSGHFJSD
-May need some adjustments in case some bases don't behave as well as they should but that's a task for future me after people have found and pointed out the hypothetical fucky hairstyles I'm too stoked to not rush this through right now lmao.
2017-10-28 00:58:13 +03:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Xsdew
4b6ff72f6d Catwoman Markings
This adds four new markings, all inspired from Felicia from Darkstalkers. The Catwoman chest,groin,left leg, and right left markings.
2017-10-24 20:12:22 -04:00
Yumi (AKA Gowst)
110f23bbbe adds panda ears and eye markings to character customization 2017-10-19 16:06:53 -05:00
Anewbe
04c393a953 Adds the Vatborn lore blurb, fixes some things. 2017-10-19 10:28:34 -05:00
Verkister
a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe
f42457b997 Starts work on the Vatborn Human species 2017-10-15 23:26:22 -05:00
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Natje0
872bef5b45 ...Fixes a smol mistake so the hair sprite shows.
OK, NOW EVERYTHING IS TESTED AND WORKS.
2017-10-12 16:51:26 +02:00
Natje0
55747968f5 Accomodates Gazers Lilianfluff fix 2017-10-12 04:42:10 +02:00
Natje0
3ec3a0de7c Code for Hair and EyeMarking 2017-10-12 03:30:22 +02:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Cameron653
02682ede9a This shouldn't be capitalized 2017-10-04 13:54:07 -04:00
Spades
176a425188 Merge pull request #2256 from Verkister/spriteshitonceagain
More hyuuge icon blending overhauls! (ADDrocities begone!)
2017-10-03 22:31:43 -04:00
Cyantime
324ff70a42 Fixes neutral traits. 2017-10-03 15:28:01 -04:00
Verkister
2a0de4b06e More hyuuge icon blend mode overhauls!
-Converted unathi base sprites and blending to MULTIPLY mode.
-Converted tajaran base sprites and blending to MULTIPLY mode.
-Converted skrell base sprites and blending to MULTIPLY mode.
-Converted teshari base sprites and blending to MULTIPLY mode.
-Converted pretty much every colorable hairstyle to MULTIPLY mode.
-This includes species specific and facial hairs as well.
-Added more 'furry' races to the vulp hairstyle compatibility list.
-Removed the old ears from the sergal hairstyles.
-Applied the earlier hand/arm overlap fix to the synthsergal limbs as well.
-Proved myself some sort of a goddamn deity over actually doing this shit that was supposed to be impossible to pull off at this point lmao.
2017-10-03 18:24:07 +03:00
Verkister
3b05d12bc3 Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshitonceagain
# Conflicts:
#	icons/mob/human_face_vr.dmi
2017-10-02 20:51:54 +03:00
Verkister
5ac851be51 Some more sprite accessory stuff.
-New set of modular one-limb longsock markings.
-Eggnerd FBP color panel markings set (sorry serds, had already been planning this since the moment i figured out the synth markings stuff)
-Dual-color mech tail relating to the forementioned.
-Made otie ears dual-colorable as originally intended.
-Fixed sergal markings covering their eyes.
-Also slightly tweaked the eyes.
2017-10-02 20:47:59 +03:00
killer653
d4ab222470 Adds Kira72's fluff 2017-09-30 19:55:29 -04:00
Anewbe
8e601c5eee Fixes hair, restores Vox hairstyles 2017-09-23 16:41:15 -05:00
Belsima
dcacb2182a Replaces vox sprites. 2017-09-22 14:29:30 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe
e01cbf4f02 Merge pull request #3861 from Belsima/hair
Adds a bunch of new hair styles.
2017-09-19 20:59:08 -05:00
PrismaticGynoid
da62af2fdb Dirt, hair, and underwear
Fixes the bug where prometheans would be able to eat the same dirt repeatedly, since the tile never actually got the dirt removed. Also, prometheans are no longer able to eat dirt and other messes off the floor unless their feet are uncovered.

Prometheans are now able to pick their hair in the character setup menu, and also to have underwear. Hopefully you get the goo-resistant kind.
2017-09-17 16:05:19 -07:00
Belsima
0a9cacd04e adds a bunch of hair styles 2017-09-17 14:54:27 -04:00
Anewbe
c0aff71c72 Fixes Dwarf Beard 2017-09-15 22:14:03 -05:00
kcin2001
e347c4f8b4 Merge branch 'master' into Harpy 2017-09-04 20:53:45 -07:00
kcin2001
c16d91235c harpy to Rapala and harpy marking name changes 2017-09-03 13:48:00 -07:00
kcin2001
49993645bf makes xeno heads ears and fixes the colorable mature inkling ears hair 2017-08-31 21:22:08 -07:00
kcin2001
7f4eec0cf9 adds harpy markings 2017-08-31 18:48:59 -07:00
kcin2001
9f7c777c9d i forgot a quote 2017-08-21 14:21:12 -07:00
kcin2001
a766cc8ed0 Starting to add harpies (first with hair)
the first in many files and steps
2017-08-21 14:20:25 -07:00
killer653
e59bb743c7 Fixes spider hair&markings 2017-08-14 16:32:55 -04:00
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00