Commit Graph

872 Commits

Author SHA1 Message Date
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
Verkister
8cf204e325 Code snippet part for the zorren markings. 2017-07-17 23:37:16 +03:00
PrismaticGynoid
ad6e395ae2 Replaces intelliCards with intelliCores.
Sprites replaced with a black box that could conceivably contain a brain, while obscuring the details. Complete with screen and convenient handle.
Usage text modified to make sense for MMIs/posibrains, instead of just drone brains (e.g. downloaded → transferred).
Description added to the new intelliCores. Made into normal-sized item, similar to MMIs/posibrains.

This is an alternative to either changing lore to allow for brain uploading, or changing code to allow for choosing multiple AI brain types.
2017-07-13 00:14:34 -07:00
Verkister
ea0578c547 More stuff.
-Added one pixel to every wolf taursuit to match them with the earlier body tweak that smoothed out the 90 degree tail snap angle.
-Added a few bootleg raccoon marking bits.
-Ported otie taur by request sure why not.
-Probably forgot to list something here but it's past 3 am and me no feel like braining no more.
2017-07-12 03:23:20 +03:00
Verkister
b1be362c22 A bunch of markings stuff.
-Added a bunch of markings from my older citadel ones.(otie, cow, corvid)
-Ported over the colorable otie wagtail.
-Added ears for otie and cow, colorable and plain versions.
-Ported over my old citadel drake taur.
-Added a fixed _vr version of ponytail 6.
2017-07-12 01:13:15 +03:00
RezRaz
96fec7a66a Add files via upload 2017-07-04 14:14:58 -05:00
Screemonster
bf695ef397 forgot some 2017-06-20 10:23:52 +01:00
Screemonster
47b2d379a4 fixes markings, adds hairstyle options to chimera 2017-06-20 10:21:37 +01:00
Arokha Sieyes
c9595f5ba8 Adds 'Quit This Round' verb for ghosts
This verb frees your job slot, removes you from the manifest, and removes your mind/body records so you can't be resleeved (if you do this sooner than 15 minutes, medical will not be nodified of your demise). This prevents you from respawning as that character (you can play any other character if you want).

**People should start using this**, it's really helpful to people who want to play your job if you're not coming back. Just use it if you're done for the day, or want to switch characters, or whatever.
2017-06-09 23:05:48 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
a412b5063b Merge pull request #3423 from Belsima/ftm
Lets biological females have facial hair.
2017-05-29 18:31:18 -05:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Leshana
1b0474d57a Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-25 15:37:43 -04:00
Leshana
4197a6e60d Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-23 01:14:55 -04:00
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Arokha Sieyes
c541122123 Convert to using Mediamanager lobby music
Update the JSON!
2017-05-08 02:33:46 -04:00
Yoshax
c808a6fb66 Removes Unathi from chin bob 2017-05-06 20:27:28 +01:00
Yoshax
6635857cf1 Ports a bunch of hair or something 2017-05-06 19:37:55 +01:00
sabiram
6cfc825f53 Adds and fixes some hairstyles 2017-05-06 19:30:59 +01:00