Commit Graph

21 Commits

Author SHA1 Message Date
KasparoVy
1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output
more visible at runtime, to someone who isn't watching DD first-hand
2016-08-24 09:55:19 -07:00
KasparoVy
9bc614a28e Conflict resolution and adds sanitization to marking SQL handling. 2016-08-21 00:01:12 -04:00
Krausus
98989aa19c SQL sanitization fixes
- Completely removes sql_sanitize_text
- Fixes inconsistent encoding of flavor and records texts
- Adds some extra sanity checking to sanitizeSQL
2016-08-19 19:58:32 -04:00
KasparoVy
4bd468b85e Defines and Morph Eye-colour Change Fix. 2016-08-14 06:21:26 -04:00
KasparoVy
a5722fdfc4 Overhaul, adds color2R/G/B helper procs, adds marking/head accessory/body accessory (colours included) randomization in char prefs.
Color2R/G/B helper procs and PR overhaul suggested/co-authored by Krausus.
2016-08-12 22:37:40 -04:00
KasparoVy
3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles...
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
2016-08-09 22:01:45 -04:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
KasparoVy
769a100580 Parallax revert. remote-tracking branch 'upstream/master' into tail-markings 2016-07-28 19:00:53 -04:00
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax"
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
KasparoVy
39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
KasparoVy
02226d42c4 Fixes Bug Reading Secondary Hair Theme Colour, Adds A Bunch of Body and Head Markings
All marking sprites courtesy of @Fullofskittles, commit idea courtesy of
@Fox-McCloud

Swaps trashy Unathi Belly sprite with new ace sprite.

Adds points and banded head/body markings for Unathi, accommodating the
alt head they get.
Adds points, patches and another belly marking for Tajara including
companion head markings.
Adds two points and a second belly marking for Vulpkanin including
companion head markings.
Adds 3 tattoos.

Breaks tiger body markings apart. The head markings are now separate
from the body.
Darkens tiger markings.
2016-07-22 13:25:16 -04:00
KasparoVy
eb4a14cdfb Adds secondary hair themes, darkens Tajara, fixes Skrell/human sprite issues, Skrell secondary hair-themes, CMA and Morph support and more.. 2016-07-20 15:35:29 -04:00
KasparoVy
b497aafb90 Darkens Unathi Horns/Spines/Frills, Adds Secondary Facial Hair Colours/Support, Further Adjustment to Tigerhead/TigerheadFace Sprites
You can now colour the webbing of webbed Unathi frills independently.
Morph and CMA support has been included.
Splits tigerhead sprites into 3 versions in order to better fit the
different ears of the three species that can use it.
2016-07-19 05:58:50 -04:00
KasparoVy
b274703a18 Adds Alt Heads
known issues: no CMA support for changing alt heads
cant change alt head after you spawn in

To do: Finish unathi sharp snout lower marking
2016-07-16 00:10:42 -04:00
KasparoVy
766245091b Back up to date. 2016-07-15 13:00:35 -04:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000
d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
2016-06-13 20:11:29 -07:00
Tigercat2000
e91bd14fc6 Bay/Polaris loadouts
Basics
 - Allows you to select up to 10 items in the character menu
 - Saved per-character
 - The items will be spawned when you join
 - Some items may have job limitations

Included Items
 - Accessories
   - Scarf
   - Black Scarf
   - Christmas Scarf
   - Dark Blue Scarf
   - Green Scarf
   - Light Blue Scarf
   - Orange Scarf
   - Purple Scarf
   - Red Scarf
   - Striped Blue Scarf
   - Striped Green Scarf
   - Striped Red Scarf
   - White Scarf
   - Yellow Scarf
   - Zebra Scarf
 - Cosmetics
   - Blue lipstick
   - Jade lipstick
   - Purple lipstick
   - Red lipstick
 - General
   - d20
 - Uniforms and Casual Dress
   - Blue Plaid Skirt
   - Purple Plaid Skirt
   - Red Plaid Skirt
   - Atmospherics Skirt
   - Black Skirt
   - Cargo Skirt
   - Chemist Skirt
   - CMO Skirt
   - Engineer Skirt
   - HOS Skirt
   - Medical Skirt
   - QM Skirt
   - Roboticist Skirt
   - Scientist Skirt
   - Security Skirt
   - Virologist Skirt
   - Warden Skirt
2016-05-11 13:00:23 -07:00