Commit Graph

583 Commits

Author SHA1 Message Date
KasparoVy
1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
KasparoVy
1826f9f174 Adds a Science beret. Obtainable via the loadouts system. 2016-09-03 06:33:22 -04:00
KasparoVy
c684a1b8fe Tidies up some (facial) hair handling and randomization.
Makes the code a lot more consistent to all the other locations it's
implemented as well.

Works the exact same as it did before but with a few less lines of code.

Also sorts out an issue with two facial hair objects having the same name. Woops.
2016-09-02 20:48:34 -04:00
KasparoVy
1c407a36a1 Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
Also corrects some oversights.
2016-08-27 09:22:01 -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
e0bad95adc Adds Some Markings and a Vulp F.Hair Style, Fixes Preferences Marking Randomization, Fixes Species-change thru CMA Bug, Fixes Vulp Kita F.Hair Style Colouring, Fixes Fatness and Deformation.
Previously, your markings would only randomize if you clicked the randomize button and were of a species that had body markings. Fixes that and tidies up the proc calls for marking randomization a bit.

Furthermore, a bug existed where if you changed a mob's species via CMA, the mob's cosmetic attributes (hair, hair colour, skin colour, skin tone, marking styles and colours, head accessory style and colour) will not have changed correctly. Delaying appearance update fixed that.

Finally, a mob's body will now correctly render as fat if they become fat and skinny if they become skinny and show deformities immediately.
Further explaining this fix: It required an override to be implemented in update_body that re-cached the mob's bodyparts in order to reflect changes to the limbs (i.e. fatness/slimness).
As for deformation, I just needed to modify the existing update_body() proc call.
2016-08-23 09:06:03 -04: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
44bf253594 Some CMA Improvements, an Alt Head Marking Handling Tweak, some Marking Colouration Fixes and patching the last of the gorey spots.
Changing your body accessory or alt head will now update the list
entries since the amount of available markings will change depending on
which body accessory/alt head you have.
can_change_alt_head() will now check the head organ's species instead of
the body's species.
can_change_markings() has been updated as per the style of a recent PR
(forgot the number).

Resolves an oversight where the Unathi Tiger Head marking was intended
to be available regardless of what alt head you had but wasn't in
reality.

Resolves an oversight where while the body Tiger markings were darkened, the head/face Tiger markings were forgotten.

Patches the last couple gorey spots I missed.
2016-08-19 08:10:37 -04:00
KasparoVy
ab3f71b359 Conflict resolution again 2016-08-19 01:08:08 -04:00
KasparoVy
492be645c1 Reverts unnecessary eye-colour setting fix in preferences.
Resolved by https://github.com/ParadiseSS13/Paradise/pull/5495
2016-08-18 22:20:29 -04:00
Crazylemon64
6aedd26beb Fixes a bunch of organ-related bugs 2016-08-18 19:08:29 -07:00
KasparoVy
29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
Fox McCloud
c21299ddda Merge pull request #5447 from Crazylemon64/serialization_eyes_fix
Improves Serialization
2016-08-17 20:10:24 -04:00
Fox-McCloud
71d862cabd Merge remote-tracking branch 'upstream/master' into strips-out-media 2016-08-17 17:46:26 -04:00
KasparoVy
e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
KasparoVy
4bd468b85e Defines and Morph Eye-colour Change Fix. 2016-08-14 06:21:26 -04:00
Crazylemon64
3ca5a1f3f7 Removes eye color vars on the human, stores it on the eyes
Also adds a proc nifty for SDQL fans, which grants greater control over
spawning atoms.

Also fixes deserialization to make hair show up again
2016-08-13 23:05:32 -07:00
Fox-McCloud
1df5fd5e9d Strips Out Media Players 2016-08-14 00:03:09 -04:00
Fox-McCloud
3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -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
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -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
Kyep
e64215ddb1 Update 7
- Fix: Drones now get assigned_role = Drone.
- Tweak: AI is no longer considered a head job for playtime system
configuration purposes.
- Tweak: Job gating (when enabled - its off by default) is based on Crew
playtime now. This is for all jobs, including heads and AI. Gating based
on department playtime is still possible, but based on a separate config
option that's also turned off by default.
2016-08-08 23:04:26 -07: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
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings
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 21:58:45 -04:00
Fox McCloud
bf52aec722 Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses
Adds cosmetic sunglasses
2016-08-07 23:06:20 -04:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Isaac Erwin
4b46c2cf6b Adds cosmetic sunglasses 2016-08-06 19:43:55 -04:00
Kyep
ab3bb8e4b7 Update 5
- Made use_exp_restrictions_heads_hours text2num'ed in configuration.dm,
rather than on use
- Converted all exp_types to #defines, instead of magic strings
- Moved exp_jobsmap to jobs.dm
- Replaced has_exp_for_job with job.available_in_playtime, which returns
- Changed <BR> -s to <LI>s, for proper HTML lists
- Made update_exp less indented, easier to read
- Fixed potential runtime in admin/topic.dm when calling exp window on a
non-existent mob
- Made job preferences screen tell you how long until you unlock each
locked job, in hours or minutes as appliccable
- Changed SQL storage format because mediumtext does not support default
''
- Converted exptimer() into a roundstart hook proc

Missed body tag

Typo fix
2016-08-05 01:30:57 -07: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
Kyep
c3ec34399a Initial Checkin 2016-07-28 02:53:57 -07:00
KasparoVy
861d873fac Vox versions of the new tattoos. 2016-07-26 02:37:29 -04:00
Mieszko Jędrzejczak
800669a2dd Dresses sandals, dress sandals, sandals. 2016-07-24 22:28:10 +02:00
Mieszko Jędrzejczak
dc8c0df65d Shines shoes, shines. 2016-07-24 22:18:07 +02:00
Mieszko Jędrzejczak
452ce45470 Adds things, things. 2016-07-23 22:20:40 +02:00
Isaac Erwin
8697578444 I need to go to bed 2016-07-23 06:34:24 -04:00
Isaac Erwin
31dc49cec7 Fixes the slash thing too, because Fox doesn't have any faith in me, among other reasons 2016-07-23 06:19:02 -04:00
Isaac Erwin
3fdee319e4 Fixes corporate security uniforms not being selectable 2016-07-23 06:03:59 -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
0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
TheDZD
977aa93e44 Merge pull request #5089 from Fox-McCloud/clothing-restrictions
Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change
2016-07-21 10:09:36 -04:00
TheDZD
a58245e109 Merge pull request #5131 from Fox-McCloud/cleanup
Cleans up Vars
2016-07-21 09:16:03 -04:00
FalseIncarnate
f8699555db Fixes Engineering Coat and Hat not spawning for engineers
It's "Station Engineer", not just "Engineer" for the allowed_roles.

🆑
bugfix: Engineers can properly show up for work with their hats and
coats to keep warm.
/🆑
2016-07-21 02:50:59 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -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