cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,674 Commits 26 Branches 2 Tags
b8c6e5c6e565ae96c2e2cc94ff0c132e42629708
Commit Graph

608 Commits

Author SHA1 Message Date
Fox McCloud
45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2 
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-10-23 19:29:54 -04:00
Isaac Erwin
0cc8a94d5d Fine 2016-10-04 17:49:42 -04:00
KasparoVy
3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
Krausus
ce41e99f35 Fixes PMing stealthmins 2016-09-13 00:43:19 -04:00
Krausus
b0ac462166 Integrates UIDs into View Variables 2016-09-08 19:04:50 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
aefb664a58 Implements UIDs and initial topic integration 2016-09-05 22:33:10 -04:00
KasparoVy
7a7ad57271 Conflict Resolution 2016-09-03 21:45:48 -04:00
KasparoVy
1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
Fox McCloud
4eb1aff523 Merge pull request #5551 from IcyV/BottleFixes 
Makes bottles not as terrible
 2016-09-03 13:24:40 -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
0b77f70ef0 Fixes a couple bugs, resolves some issues, re-adds a few more bottle choices. 2016-08-27 23:42:31 -04:00
IcyV
be223511b9 A few more tweaks and updates. 
Most of this can be attributed to KasparoVv
 2016-08-27 07:46:39 -07: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
6efd9efdfe bottle filler icon handling and nanoui fixes 2016-08-27 04:02:11 -04:00
KasparoVy
cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -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
Krausus
6ab552f0fa Fixes Goonchat delaying client/New, again 2016-08-22 22:40:56 -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
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
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -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
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