Commit Graph

893 Commits

Author SHA1 Message Date
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
killer653
32ee9af282 Adds spider-eyes 2017-08-12 23:17:59 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Verkister
ba84cf66f5 Fixes vulp belly markings missing groin bits. 2017-08-12 23:12:48 +03:00
Verkister
1178f7dc38 reverts a redunant accident edit 2017-08-12 19:20:59 +03:00
Verkister
97c5cb924b A big accessory blend mode overhaul.
-Converted a buttload of markings, ears, and tails to use multiply blend mode instead of add.
-Enabled marking type dependent blend mode for markings code (was hard limited to add mode)

ears
-squirrel
-bear
-wolf
-sergal
-otie
-cow
-jagged
-elven
-sleek

tails
-squirrel
-kitty up and down(w)
-tiger(w)
-stripey
-bear
-wolf
-ringtail
-dragon
-curltail(w)
-straight(w)
-tigertail(w)
-vulptail(w)
-otie
-jagged
-snaketail
-sergal

markings
-vulp set(belly,fullbelly,crest,nose,face,earsface,allhead)
-sergal full(f/m)
-monoeye
-nevrean beaks
-shaggy mane
-otie set(nose,face,belly,back,fingers,socks)
-cow full
-corvid set(belly,beak)
-jagged set(body,snout,mask)
-zorren set(belly,face,muzzle,socks,longsocks)
-tesh feathers
2017-08-12 19:08:23 +03:00
killer653
5b28d69ca6 Invisible Spawn Bug Fix 2017-08-10 19:34:21 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Verkister
02f8a57966 conflict merge done did something funky 2017-07-27 02:38:45 +03:00
Verkister
2492e7dbf5 Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	icons/mob/human_races/markings_vr.dmi
2017-07-27 02:21:53 +03:00
Verkister
90c6c5f2e2 Slight sergal overhauls.
-Apart from ears basically everything is new.
-Full body markings updated as well.
-Added a dual colorable sergal tail.
-Added a new full body markings set that's basically just some simple body shading to make up for coloring induced contrast loss.
2017-07-27 02:15:36 +03:00
killer653
4c4c85a742 Fixes Conflicts 2017-07-26 00:00:51 -04:00
Verkister
6522105aa3 Some more stuff.
-Added framework for custom heads using custom eyes without messing the base code.
-Slightly tweaked sergal markings.
-Added new eyes for sergals with little more snout space inbetween.
-Added teshari feathers as markings after failing to fix them for custom species.
2017-07-25 19:27:27 +03:00
Cameron653
2a798021dc ...This too 2017-07-21 14:39:56 -04:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00