Commit Graph
655 Commits
Author SHA1 Message Date
Markolie cf31814e80 Exploit fixes 2016-10-17 18:51:49 +02:00
KasparoVy 1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -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 9bc614a28e Conflict resolution and adds sanitization to marking SQL handling. 2016-08-21 00:01:12 -04:00
Fox McCloudandGitHub 7d9770f59d Merge pull request #5486 from TheDZD/genetics2
Genetic Instability Refactor & Minor Genetics Rebalance
2016-08-19 20:11:46 -04:00
TheDZD fbf51ed4bb Increases activation chances for rarer powers 2016-08-19 18:14:15 -04:00
KasparoVy ab3f71b359 Conflict resolution again 2016-08-19 01:08:08 -04:00
Fox McCloudandGitHub 08800863ad Merge pull request #5495 from Crazylemon64/organ_fixes_v2
Fixes a bunch of organ-related bugs
2016-08-18 23:49:52 -04:00
Crazylemon64 6ff4f694b7 Remove debug messages 2016-08-18 19:12:48 -07:00
Crazylemon64 6aedd26beb Fixes a bunch of organ-related bugs 2016-08-18 19:08:29 -07:00
TheDZD fda0953f03 Minor genetic instability refactor & minor genetics rebalance 2016-08-18 15:01:19 -04:00
TheDZD 31996e7842 Fixes gene de-activation not always working, removes deprecated genetics define. 2016-08-18 14:41:20 -04:00
KasparoVy 29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
KasparoVy 4bd468b85e Defines and Morph Eye-colour Change Fix. 2016-08-14 06:21:26 -04:00
Crazylemon64 af8ebfc469 Adds a helper for saving a head's traits to DNA 2016-08-13 23:28:39 -07: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
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 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
Fox McCloudandGitHub 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 McCloudandGitHub b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer
Adds a "Save" buildmode
2016-08-08 02:34:02 -04:00
pinatacolada 660ffdded5 only sergey can stop white space abuse 2016-08-04 19:25:21 +01:00
pinatacolada e24ecd0a11 i know what i'm doing trust me i have like degrees 2016-08-04 19:17:10 +01:00
pinatacolada c83b6a3375 nice indenting pinata 2016-08-04 19:10:46 +01:00
pinatacolada fc54696914 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into sweden
# Conflicts:
#	code/game/dna/genes/goon_disabilities.dm
2016-08-04 18:56:06 +01:00
pinatacolada 7d7c9aa647 please god tell me i fixed the morgue conflict 2016-08-04 18:50:05 +01:00
pinatacolada ea35dc2b24 attempting to fix morgue conflicts
and probably failing
2016-08-04 18:02:01 +01:00
pinatacolada b1c3a51561 now it's organized 2016-08-04 17:49:11 +01:00
pinatacolada a37f52abaa Makes the swedish gene more swedish
http://puu.sh/qpJiJ/957288bc2b.png

Also because I'm not sure if git will fuck up the encoding or not:
http://puu.sh/qpJpa/d4e5bd814e.png

🆑 Pinatacolada
add: Makes the swedish gene spit out weird swedish chars and sounds
/🆑
2016-08-04 17:43:53 +01:00
Crazylemon64 471a5ecca1 First pass at a functioning map writer 2016-08-03 13:26:22 -07:00
Crazylemon64 cc784f338e Adds bare bones for a persistence system
Admins can toy around with converting a character to text, and
placing them back elsewhere, independent of the round.

It's got a kink, though: The text given to you directly needs to be
printed once to remove all the escapes - otherwise the thing will choke.
I'd like advice on resolving that
2016-07-27 13:31:19 -07:00
KasparoVy dc1733d976 Reverts Unnecessary Genetics Icon Skin-tone Foolery
Residual from another PR, forgot to gut it.
2016-07-21 14:16:20 -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
Fox-McCloud 1ac09a962c Cleans up Vars 2016-07-21 01:43: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 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 005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -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 766245091b Back up to date. 2016-07-15 13:00:35 -04:00
TullyBurnalot 1bd63b62d2 Target list no longer uses living_mob_list
It's now, instead, just a regular list.
2016-07-11 20:01:30 +01:00
TullyBurnalot b3dad9dae8 Fixes Unstable REMOTE_VIEW Bug
- Players with PSY_RESISTANCE are no longer viable targets for
REMOTE_VIEW
2016-07-10 02:44:00 +01:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD 2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
TheDZD 551b2aefbd Remove some shit from Life(), and fix wiznerd thing 2016-07-03 15:51:43 -04:00
TheDZD 4bfd6ce95a Changes numbers 2016-07-03 15:51:19 -04:00
TheDZD 3605aa5e4d Re-Adds Instability 2016-07-03 15:51:17 -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
TheDZDandGitHub b54b3a8fb2 Merge pull request #4775 from Fox-McCloud/mutate-fix
Wizard Mutate Spell Fix
2016-06-26 14:58:54 -04:00