Commit Graph

225 Commits

Author SHA1 Message Date
Razgriz
cd9f69570b Merge pull request #5702 from CHOMPStation2/upstream-merge-14472
[MIRROR] adds trait preferences and removes a bug
2023-02-12 19:12:11 -07:00
Razgriz
a5037f3180 Revert "[MIRROR] Runtime fixes" 2023-02-12 19:03:56 -07:00
Razgriz
cd05f4c7e4 Merge pull request #5704 from CHOMPStation2/upstream-merge-14476
[MIRROR] Runtime fixes
2023-02-12 19:01:40 -07:00
Razgriz
9229e66b90 powder that makes you say yes 2023-02-12 18:56:11 -07:00
Razgriz
0b1059963b comments that make you say yes 2023-02-12 17:59:01 -07:00
Casey
2891dc3ea7 Merge pull request #14476 from Heroman3003/runtime-17
Runtime fixes
2023-02-12 18:21:37 +00:00
Casey
ffd8251f24 adds trait preferences and removes a bug 2023-02-12 18:20:26 +00:00
Rykka Stormheart
cc135c3d33 Fixes Custom Cold messages being uneditable/editing the wrong list
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.

This corrects that.
2023-02-08 08:01:31 -08:00
Nadyr
ccc3101516 powder that makes you say yes 2023-02-07 16:45:46 -05:00
Casey
ac099a732b proper sanitization of cold and heat messages 2023-02-07 19:19:18 +00:00
Rykka Stormheart
e25aeb10d1 Indent oopsies in github copy 2023-02-07 09:27:21 -08:00
Rykka Stormheart
f8fe0768b0 Earlyports #14459 from VORE, properly sanitizes heat/cold messages
Credit goes to Seris, not me, just earlyporting.
https://github.com/VOREStation/VOREStation/pull/14459
2023-02-07 09:19:15 -08:00
Nadyr
0e4960fc88 Merge pull request #5619 from CHOMPStation2/upstream-merge-14384
[MIRROR] Adds ability to customize discomfort
2023-02-02 20:45:58 -05:00
Nadyr
6945894ad7 Merge pull request #5633 from CHOMPStation2/upstream-merge-14386
[MIRROR] sanitizes selection of custom bases in prefs
2023-02-02 20:38:26 -05:00
Heroman3003
16008d3571 Merge pull request #14386 from Seris02/shapeshiftersanitization
sanitizes selection of custom bases in prefs
2023-02-01 21:42:39 +00:00
Heroman3003
515e92e594 Adds ability to customize discomfort 2023-01-28 22:12:59 +00:00
Heroman3003
de1e7c527c Merge pull request #14394 from Cyantime/patch-2
Hitting cancel when setting character ad no longer blanks it in setup
2023-01-28 19:53:00 +00:00
Nadyr
3b259e189d Merge pull request #5589 from CHOMPStation2/upstream-merge-14355
[MIRROR] few small fixes and improvements for proteans
2023-01-27 10:21:37 -05:00
Rykka
dbb639fc59 Removes BDSM and Furry/Human Preference Toggles 2023-01-23 12:56:13 -08:00
Rykka
5ed802978f Adds CHOMPStation Comments
Just-in-case.
2023-01-23 12:56:00 -08:00
Rykka
87482853ea Character Directory Update - Adds Four Additional Tags
This will be ported upstream to VOREStation momentarily, hence the lack of // CHOMPStation comments.
If upstream makes any changes or rejects the PR, I will add comments on as needed.

Adds four new preferences + tags, shown here!
![](https://cdn.discordapp.com/attachments/404660884531707906/1041243283373948978/azcYOMj.png)

Gender, Sexuality, BDSM Role, and Furry/Human Preference.

The latter two may be unnecessary, particularly the BDSM role, but I figured it was an easy addition, and just as easy to remove on request!

The intent for these additions is to make perusing for scenes ever-so-slightly easier, and lay out important keynotes such as gender more clearly.
2023-01-23 12:56:00 -08:00
Heroman3003
cb32a65c87 few small fixes and improvements for proteans 2023-01-22 01:35:08 +00:00
Heroman3003
1ba39fee84 Merge pull request #14056 from Seris02/prometheanchanges
promethean fixes and QoLs
2022-11-28 21:51:35 +00:00
Verkister
baaec13a56 Finally some symmetry for sharp scaling
Whoa boye we finally did it after so many years.
Figured out how spaceman scales without wacky disfigured symmetry.
-Adds symmetry.
-Adds buttons to toggle it.
-Adds it to prefs too.
-Only affects sharp scaling. (fuzzy did not like symmetry at all)
-Adds mob and species var for offset, 0.5 for odd center (spacemen etc) and 0 for even center (teshari etc)
While the symmetry itself is working flawlessly (at least front/back), it may look wack at near-100% sizes (nose instantly double-widened or vanished), but it can be overridden both, in prefs and while ingame.
2022-10-14 20:57:59 +03:00
BlackMajor
3daf934af0 forgot some comments 2022-07-21 13:17:41 +12:00
BlackMajor
1affb3a089 Some preferred changes 2022-07-20 22:34:04 +12:00
Nadyr
259d1fd47d Merge pull request #4549 from CHOMPStation2/upstream-merge-13319
[MIRROR] Adds roulette balls
2022-07-19 20:55:00 -04:00
Nadyr
38f0f6355e powder that makes you say yes 2022-07-19 20:41:45 -04:00
Nadyr
78ffd7f32a Merge pull request #4448 from CHOMPStation2/upstream-merge-13201
[MIRROR] Fixes positive and negative traits being unsavable for non-custom species
2022-07-19 20:32:24 -04:00
Nadyr
7f2936e816 Merge branch 'master' into upstream-merge-13193 2022-07-19 20:17:40 -04:00
Nadyr
6a99a3dd7e Merge pull request #4425 from CHOMPStation2/upstream-merge-13178
[MIRROR] Adds Linguist and Polyglot traits
2022-07-19 20:16:05 -04:00
Nadyr
5a7ae556cd powder that makes you say yes 2022-07-19 19:53:21 -04:00
BlackMajor
9ee3e2688c Merge branch 'master' into upstream-merge-13336 2022-07-19 18:30:09 +12:00
Casey
f19463e5a9 Voice types! 2022-07-16 08:53:22 +00:00
Casey
022cebb0c9 Say Sound! 2022-07-16 01:37:06 +00:00
Nadyr
7538f6481c powder that makes you say yes 2022-06-29 19:04:37 -04:00
Nadyr
03de2b7388 powder that makes you say yes 2022-06-29 19:01:45 -04:00
Nadyr
1f3090bcc6 powder that makes you say yes 2022-06-29 18:59:51 -04:00
Casey
dc4253f86c Merge pull request #13201 from Heroman3003/traitfix1
Fixes positive and negative traits being unsavable for non-custom species
2022-06-29 20:37:23 +00:00
Casey
6ab64ba666 Implements all-species positive and negative traits 2022-06-29 06:01:30 +00:00
Razgriz
72a172464a powder that makes you say yes 2022-06-27 16:06:14 -07:00
Casey
ecf834c452 Adds Linguist and Polyglot traits 2022-06-26 18:02:51 +00:00
Nadyr
38a40b6ef6 powder that makes you say yes 2022-06-23 00:11:10 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
0b734943a3 Merge pull request #12763 from KillianKirilenko/kk-feedback
Verb Reset Buttons
2022-04-17 21:40:01 +00:00