Commit Graph
303 Commits
Author SHA1 Message Date
Isaac Erwin 0cc8a94d5d Fine 2016-10-04 17:49:42 -04:00
Kyep 7e613798b0 Fixes merge conflict in admin_verbs.dm 2016-10-01 13:26:24 -07:00
KasparoVy 3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
Krausus d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
KasparoVy 4ef6f71622 Less Blurry Character Preferences images. Ported from VG
https://github.com/d3athrow/vgstation13/pull/11149
2016-09-03 22:05:12 -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
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 McCloudandGitHub c21299ddda Merge pull request #5447 from Crazylemon64/serialization_eyes_fix
Improves Serialization
2016-08-17 20:10:24 -04:00
KasparoVy e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -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 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 McCloudandGitHub 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
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
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
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
KasparoVy b84a941488 Adds Tajaran Nose marking, Doubles up Ear Stuff for added Customization, Fixes Alt Head Prefs Bug + More Sanity, Refactors Morph Again, ....
Adds 5 more Tajaran hair styles, sprites from Polaris and fixes an issue
where Tajara and Vulpkanin couldn't be bald in character preferences.

The alt head prefs bug became prevalent if you spammed the 'reload slot'
button on certain characters. They'd get an alt head and if you switched
slots it wouldn't go away-- breaking head icon generation. Woops. Not a
problem anymore because the var isn't initialized to null and is
corrected in the prefs screen. Also refactors the morph ability to use
the change_whatever procs from appearance.dm. Removes redundant
update_body from force_update_limbs.
2016-07-18 20:11:01 -04:00
KasparoVy 35619f62e2 Adds Vulpkanin Markings, Adds Vulp/Unathi/Human Hairstyle, Fixes Vulp Default Colour, Corrects Typos in Sprite_accessories, Darkens Vulpkanin Facial Hair
Expanding on the above: Adds Vulpkanin nose and chest crest markings.
Adds Vulpkanin braided hairstyle (Tajaran Braid ripoff) and hippie braid
for Humans/Unathi (also a Tajaran Braid ripoff).
2016-07-18 04:37:56 -04:00
KasparoVy 710c722535 Tidies up and Finalizes Alt Heads, adding Morph + CMA support + more...
Another parameter has been added to the update_body proc that allows you
to force the regeneration of limb icons. Absolutely crucial to alt_heads
as, without this functionality, you would never be able to change the
head after you spawned via Morph or CMA among other issues.
2016-07-17 19:23:41 -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
Fox-McCloud d8895b0ce9 Actually Fixes Medical, Security, and Employment Records 2016-07-13 05:08:44 -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
Krausus b37cecbeae Fixes various runtimes (squashed)
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
2016-07-05 23:30:01 -04:00
Krausus 3b164cd8aa Loadout fixes and loadout points config option
- Adds a configuration option for loadout points.
- Fixes the blue plaid skirt lacking its own unique type, causing
runtimes due to the mismatch between its display_name and
initial(display_name).
- Fixes the gear selection table using a fixed width.
- Fixes the restrictions column not consistently being added.
- Fixes the header and footer lacking the proper column span to account
for the restrictions column.
2016-07-03 00:24:40 -04:00
Tigercat2000 82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
2016-06-27 08:20:49 -07:00
Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
2016-06-19 16:28:57 -07:00
Tigercat2000 37904ad4e1 Lower gear points to 5 per @necaladun's request 2016-06-15 21:07:56 -07:00
Tigercat2000 d927504dc1 Fix compile, Add job restriction column, make job skirts betterish
Job skirts now only cost 3 points, any further job skirts selected will
not count towards points. Yes, you still spawn with multiple skirts if you
are in a position that has them, no, I can't fix it.
2016-06-13 21:03:58 -07:00