Commit Graph

663 Commits

Author SHA1 Message Date
Fox-McCloud f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
Fox-McCloud d29ceda262 Merge remote-tracking branch 'upstream/master' into hair 2016-04-28 18:37:56 -04:00
HugoLuman 5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask
# Conflicts:
#	icons/mob/human_face.dmi
2016-04-26 17:32:04 -07:00
Fox-McCloud 371a122430 Hair Request 2016-04-26 01:26:24 -04:00
KasparoVy 6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
KasparoVy a9ee7ea97e PASS 1
TO DO: SCISSORS AND SHAVER REWORK
2016-04-21 19:58:37 -04:00
HugoLuman bfcebf8044 Adds Orluum to silicon dms, fixes random skin tone
Also, butt sprites

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 14:40:25 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Crazylemon64 7e13f5b465 Fixes indentation 2016-03-21 23:26:26 -07:00
Crazylemon64 b9242cc960 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into various_appearance_fixes 2016-03-21 22:39:45 -07:00
Crazylemon64 dbbbbac7a4 Moves most appearance code into "copy_to", rather than new_player 2016-03-21 22:26:41 -07:00
KasparoVy 98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
SamCroswell c1f26fac4e Fixes the tat gun 2016-03-14 17:51:27 -04:00
Crazylemon64 fff283bd2a Organs now properly retain appearance upon cloning and DNA scramble 2016-02-29 22:49:46 -08:00
KasparoVy 65e3b13d2e Readds Bald Tajaran Hairstyle, Fixes non-Human Masks 2016-02-07 02:10:44 -05:00
Crazylemon64 945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08:00
Crazylemon64 294ad1f2a6 Haven't quite gotten preferences working yet 2016-01-30 20:06:14 -08:00
Crazylemon64 ee8042d856 All is clear, ready to go 2016-01-30 12:48:54 -08:00
Crazylemon64 8f558e6f19 First pass of squishy slime hair 2016-01-29 16:37:46 -08:00
Fox-McCloud 913922b408 Adds in Skeleton Race 2016-01-27 00:45:32 -05:00
KasparoVy f769c9b23b Fixes Vox Robes + Sec Preferences Beret Icon Generation + Sigholt's Beret @ Issue #3364
Does what it says on the tin
2016-01-24 02:22:55 -05:00
Fox McCloud 18b95c61fd Merge pull request #3268 from NTSAM/master
Adds an IPC screen
2016-01-18 02:44:41 -05:00
Fox McCloud f9843fed28 Merge pull request #3195 from KasparoVy/Tail-Fix-A2
Tail Fix Take 2
2016-01-17 23:03:01 -05:00
KasparoVy b6af0dd02b TAIL FIX! Squashing all those commits...
- Adds blank icons with standardized timings for species tail wagging,
used in icon generation.
- Fixes tails overlapping arms/limbs + gloves, etc. when facing EAST or
WEST.
- Ensures tails will overlap stuff as normal only when facing NORTH so
as to avoid unwanted interference with the base sprite.
- Tails now appear in ID cards, overlaying things correctly.
- Tails now overlay and are overlaid by things correctly in preview
icons.
- Modifies the positioning of tail icon generation in the ID card
preview icon generation file.
- Modifies the positioning of tail icon generation in the player
preferences preview icon generation file.
- Breaks limb generation into its own layer, breaks tail generation into
a second layer that can be overlaid by limbs.
- TAIL_LAYER will now overlay the NORTH direction sprite of a tail now,
while TAIL_UNDERLIMBS_LAYER gets all remaining directions.

**AIMS TO DO THE FOLLOWING:**
- *ELIMINATE THE ISSUE IN #3183 WITH DUPLICATE TAIL ICON GENERATION*
- *ELIMINATE THE ISSUE IN #3183 WITH TAILS WAGGING TOO FAST/INCORRECTLY*
- *ELIMINATE THE ISSUE IN #3183 WITH BODY ICONS NOT RENDERING*

Missed a spot

Occurred when reformatting the code and reducing the number of pointless
variables

Missed a spot 2

Crash Fix

Fixes Spontaneous Tail Overlapping Limbs

Tiny Unathi Sprite Corrections

One pixel on the Unathi right arm east direction sprite was miscoloured
(used left arm west direction as a reference), and the animated Unathi
tails previously did not meet the body while naked-- appearing to float.

Fixes both

Finalizes Changelog

Cleans up Vox puke

Accommodates Admin Overrides to body_accessory Species Checks & Fix

Does the above
Elaborating on accommodation: Species getting body accessories that
wouldn't normally be getting body accessories will inherit the
Vulpkanin's default animation template as those are currently the only
tails we have to worry about right now
Elaborating on Fix: Adds a default animation template for Vulpkanin in
body_accessory as the animation timings for Vulpkanin tails there are
different from those in effects/species.dmi

Unathi Static Tail Fix

Adjusts north-direction Unathi static tail sprite, now attaches to the
body in the correct location.

This PR is now on Sale!

Significantly cheaper.

Now, it will only generate tail icons on a per-direction basis if the
user's species is flagged to have a tail that is overlapped by limbs
(TAIL_OVERLAPPED).

Otherwise, it just uses the traditional cheapo method of icon
generation.

This way, we have fixed wagging Voxtails at a lower cost.

Even Cheaper

If the user's species isn't flagged to have a tail that needs to be
overlapped by limbs, it won't divert limbs into their own layer as it's
unnecessary. Tested by spawning a member of every species, walking
around to see if there was any directional issues, wagging and *swagging
all tails-- all is still working as it should be.
2016-01-17 19:32:22 -05:00
NTSAM 4407553202 Adds a new IPC screen
Adds a rainbow IPC screen.
2016-01-17 00:00:56 -05:00
KasparoVy 902337b828 Crosses Ts 2016-01-15 01:06:59 -05:00
KasparoVy ab69e1a3a6 Missed a spot. 2016-01-15 00:51:56 -05:00
KasparoVy b10a516bde Adds TG Underwear, Fixes Beret and NV Scigogs 2016-01-15 00:40:11 -05:00
TheDZD 4941d804fa Merge pull request #3184 from ParadiseSS13/revert-3166-Tail-Fix
Revert "Fixes Tails Overlaying Arms"
2016-01-10 18:17:12 -05:00
Fox McCloud f42db0f8b8 Merge pull request #3180 from Kyep/obsannoyance
Clarified confirmation prompts for ghosting
2016-01-10 18:04:49 -05:00
Fox McCloud 274b9df69f Revert "Fixes Tails Overlaying Arms" 2016-01-10 08:04:07 -05:00
Kyep e73b84abd4 Clarified new_player observation button message
Previous message stated 30 minutes. This was wrong.
2016-01-09 23:59:45 -08:00
KasparoVy 0c0f505d82 Fix Pass 1
Issue: Facing north means the tail is overlayed by just about everything
but the body.
2016-01-08 16:33:57 -05:00
Fox-McCloud 59a3a5281e Vox Tail and Vulp Markings 2016-01-04 02:10:47 -05:00
KasparoVy f18c04ed0e Adds Vulpkanin head markings to Head Accessory
Tested and it turns out it looks pretty good. The purpose of this commit
is that most of the facial markings work quite well together in pairs
given proper colouring and can look pretty sweet, so why not
2016-01-02 01:13:14 -05:00
KasparoVy 8641c065a3 Removes Old Earfluff Entries, Finishes SQL Support, Accommodates #3025 2015-12-28 19:17:56 -05:00
KasparoVy 366d05f745 Generalization + Features for Other Species
Turns horns into head accessories, fixes some species checks, gets
Tajara and Vulpkanin into the mix, ensures the system cannot be
exploited, adds species-specific body markings for Tajara, Vulpkanin and
Unathi.
2015-12-28 01:02:23 -05:00
KasparoVy 738d951707 Fixes Oversight - Preference Preview Icon Using Correct Colour
I'd missed this bit before where for the preview icon (only) it was
still using the skin colour to generate the horns. Fixed it up so the
preview icon is accurate.
2015-12-27 19:48:24 -05:00
KasparoVy abb528366e Guts Tails (for now), adds Horn Colour Customization, Fixes Icon Typo, Cuts Old File, Adds Species Checks
Cuts tail markings to be implemented in another PR, adds the ability to
change the horn colour independent of the body colour and reworks the
code accordingly, drops the preferences_savefile.dm as it's unused
(@crazylemon64), adds some species checks just for uniformity
2015-12-27 19:43:12 -05:00
KasparoVy 5f72fff880 Final Pass
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.

Fixes/implements proper ID photo/preferences preview picture generation.

To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
KasparoVy 73d514f5a2 Ensures PR Won't Overwrite #2910
I was a bit sketched out 'cause #2910 changed some files that this PR
deals with, so I made changes to accommodate that which was done in
#2910.
tl;dr this pr won't mess with the work done in #2910 now
2015-12-26 01:01:07 -05:00
KasparoVy be3bb885f2 Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings) 2015-12-26 00:48:01 -05:00
KasparoVy 0f8f514671 Adds Unathi Horn and Tail Customization
Does not include tail colour correction.
In this iteration, the horns do not have their own colour-- they use the
skin colour.
2015-12-21 22:55:39 -05:00
Crazylemon 9d1dc3632b Adds a "Glider" IPC screen 2015-12-20 17:29:43 -08:00
Crazylemon 2979a64c4d Adds 3 new IPC screens: Scanline, RGB, and Console 2015-12-20 14:45:14 -08:00
Tigercat2000 0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
TheDZD 4fe7f81e97 Revert "Reverts #2687" 2015-12-09 17:25:10 -05:00
Tigercat2000 42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
Crazylemon 67366fb5d1 Fixes a bitflag check to work right.
This will probably let you have your hair in character setup again
Haven't tested it though, no time yet
2015-12-08 22:01:51 -08:00