Commit Graph

726 Commits

Author SHA1 Message Date
Fox McCloud
a80b0feae1 Merge pull request #5879 from KasparoVy/glasses_handling_properly
Adds switch-layer rendering functionality for f.hair, glasses and head accessories.
2016-12-09 18:22:27 -05:00
KasparoVy
e06218371f Sharper character creation preview images, tails/body accessories now show up in ID photos. 2016-11-25 17:55:57 -05:00
KasparoVy
64a2e876a7 Adds switch-layer rendering functionality for facial hair, glasses and head accessories. Glasses will now overlay hair only in certain circumstances.
Hair that is short (has glasses_over set) will have glasses rendered on top of it rather than the default behaviour of below it.
2016-11-12 12:08:45 -05:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
KasparoVy
82cf3fb93d Fixes a bug where certain species could not select undergarments.
Their species names were just missing from the species_allowed
definitions.
2016-10-23 23:47:51 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
KasparoVy
3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
Krausus
d64bf46f12 Topic UID finishing touches 2016-09-08 13:07:14 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
KasparoVy
1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -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
cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Crazylemon64
b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -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
Crazylemon64
88a3ba1406 Moves AI movement to their own procs, and cleans up their creation 2016-08-22 23:17:48 -07: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
d7b7df692a Minor mask tweaks, adds alt_head mask refitting, adds fitted versions of unathi masks for the new alt head.
The alt_head mask refitting system works like this: If the player has an alt_head that's not "None", the system will look for an icon state in the most relevant mask icon file that has the mask's icon state and alt_head suffix ("[wear_mask.icon_state]_[alternate_head.suffix]") and, if it exists ([(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]") the mask sprite that will appear on the character will have that icon state. If it doesn't exist, the mask sprite that will appear on the character will have the default icon state for the mask object.
2016-08-17 08:19:52 -04:00
KasparoVy
e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -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
9554428c59 Adds Tiger-stripe Tattoo, Tattoo-gun Species handling and Jacket-friendly Version of Existing Vox Hairstyle.
Adds allowed species list to the Campbell circuitry tattoo. The tattoo sprite only fit the bodies of Species in the list anyway.

Adds Jacket-friendly Version of Existing Vox Hairstyle
2016-08-11 02:56:17 -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
Krausus
2bec576fdc Adds qdels for some temporary humans 2016-08-09 02:58:36 -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
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
Krausus
545660f474 Fixes late-join window's round duration 2016-07-30 02:27:58 -04:00
KasparoVy
0dff7ce1ea Darkens Vulpkanin head hair and Tajaran head+face hair
Forgot to do this when I darkened the bodies.
Tajaran head/facial hair darkened by 28. (r - 28, g - 28, b - 28)
Refer to PR for Vulpkanin darkening factors. (Varies per-hairstyle)
2016-07-29 23:46:04 -04:00
KasparoVy
39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
KasparoVy
861d873fac Vox versions of the new tattoos. 2016-07-26 02:37:29 -04:00
TheDZD
c7f016a702 Makes CC admin-only jobs check for R_EVENT instead of R_ADMIN, fixes some message spam for mentors that don't have enough access, fixes me fucking up and not checking for rights correctly in the telecomms reset verb. 2016-07-25 19:40:55 -04:00
KasparoVy
7e4cd8ca41 Splits Vulpkanin muzzle into two markings, removing ears from one and adding south-dir ear fluff to the other. 2016-07-23 18:04:49 -04:00
KasparoVy
43c8fdbc71 Last couple Vulpkanin Markings.
A tail marking for the new alt tail and a second edition of the first
points marking.
2016-07-23 12:58:05 -04:00
KasparoVy
5d86f19c92 Vulp Nose Duped to Head Accs. + A Few More Tail Markings
Fade to both, tip to the VBST
2016-07-23 09:19:37 -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
b38e8ea190 Removes Redundant "None" Vulpkanin Hairstyle
Going to need the following query run on the SQL database:

UPDATE `characters` SET `hair_style_name` = "Bald" WHERE
`hair_style_name` = "None";
2016-07-18 20:23:27 -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
8f642828ce Alt head tweaks
Todo: CMA/morph support for alt heads.
Known issues: Can't change alt head on the fly, icon won't update
properly
2016-07-17 05:12:37 -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
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Krausus
3f4e15e35a Adds 1-second delay to late-join job selection 2016-07-01 17:22:26 -04:00
Krausus
6a8ea1db53 Categorizes Late-Join Job List (#4826)
* Late-Join Job List Categorization

* Late-Join Job List Columnization
2016-06-30 20:19:28 -04:00
Fox-McCloud
cf63c2f47e Lobby Players Ready Fix 2016-06-29 13:21:44 -04:00
KasparoVy
38717e3b03 Fragments Markings, Adds Tail and some Body Markings, Tajara Heads now have Ears
Adds Tajara inner ear and muzzle colouration as head markings, adds muzzle colouration for Unathi (sharp and round) as head markings, adds belly colouration for Tajara and Unathi as body markings.
Fixes issue where the Unathi stripe marking name in sprite_accessories was incorrect.
Also fixes a bug where setting your IPC's head to 'normal' gave it a random screen style that was often not compatible with the monitor head.
Does a bit of tidying up in tail generation mainly, but also in icon skin-tone handling and just about everywhere else I ended up working.
Adds ears to Tajara heads. Removes ears from tajara hairstyles.
Removes the now pointless Tajaran Ears hairstyle and renames the Tajaran hair objects appropriately.
Adds a Vulpkanin Body Marking and some Tail Markings.
2016-06-27 05:29:01 -04:00
Kyep
d28cb5e8bc Allows admins to save their CC characters (#4717)
* Initial Checkin

- Creates two new admin-only jobs, "Nanotrasen Navy Officer", and
"Special Operations Officer". The former is for IC investigations by
admins of situations on the Cyberiad, and spawns in the admin room. The
latter is for leading/overwatching ERT teams, and spawns at the ERT
office.
- Neither of these jobs are accessible to normal players, either on
join, in preferences, or as a random job.
- When they are spawned, no announcement is made, and they do not show
up on the crew manifest.
- In other news, the "select equipment" debug verb has also been
adjusted so that NT Navy Officers get the same equipment either way.

* Fixes teleporter on admin station so that admins can use it to teleport directly to bridge

* Fixes CC jobs not always displaying CC HUD icon for sechuds

* Adds an implant that dusts someone on their death

* Tweaks

Changes:
- CC officers now spawn with an internals box in their backpacks, like
everyone else.
- CC officers now get dust and death alarm implanters in their backpacks
on spawn, rather than automatically having the implants in their bodies.
This enables admins to test things on admin station without worrying
about dusting or having their deaths broadcast.
- Dust implants no longer provide death alarm functionality.
- Dust implants no longer process().
- Dust implants are now based on explosive implants, and can be manually
activated via deathgasp.
- CC officers now spawn with CC headsets that are named 'centcom
headset'.

* Deletes CC encryption key

* Switches to using imp_in.dust()
2016-06-26 13:57:59 -04:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00