Commit Graph

1420 Commits

Author SHA1 Message Date
BongaTheProto
d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
Aypa
a3a238db5a Merge branch 'SPLURT-Station:master' into master 2023-02-12 19:30:56 -03:00
WoolyAypa
f8b38d0c54 . 2023-02-12 18:57:52 -03:00
BongaTheProto
bb3bdf047f Merge pull request #738 from WoolyAypa/dullahan
dull han fixxe
2023-02-12 01:09:24 -05:00
BongaTheProto
3475c24721 Merge pull request #751 from SPLURT-Station/tail-fixxie
fix for snek tail
2023-02-12 01:02:35 -05:00
BongaTheProto
13a46e9592 guh 2023-02-12 00:55:05 -05:00
BongaTheProto
9cd04e7db9 Merge pull request #750 from WoolyAypa/master
space princess digitigrade flag
2023-02-12 00:48:59 -05:00
BongaTheProto
929f5399aa followup 2023-02-11 21:34:18 -05:00
WoolyAypa
a92d7e374c digitigrade 2023-02-11 22:51:04 -03:00
BongaTheProto
413968c76d Merge pull request #746 from WoolyAypa/stuff
In a galaxy far far away...
2023-02-11 02:07:08 -05:00
WoolyAypa
ba91216291 polychromic 2023-02-10 14:56:14 -03:00
WoolyAypa
ba671fad6c to the clothesmate it goes 2023-02-10 00:07:38 -03:00
WoolyAypa
48cd331cd7 stuff 2023-02-09 23:57:41 -03:00
BongaTheProto
655efc51c0 Merge pull request #740 from Comicao1/beachball
Bounty beachball
2023-02-09 20:40:48 -05:00
Comicao1
ed4a96d900 Update toys.dm 2023-02-09 22:02:18 -03:00
BongaTheProto
8ea5c66e65 Merge pull request #739 from Comicao1/inflate
bounty inflate belly verb
2023-02-09 16:50:35 -05:00
BongaTheProto
b6fa37d08f Update preferences.dm 2023-02-08 19:03:01 -05:00
Comicao1
5f4f7eebed Update toys.dm 2023-02-08 19:18:16 -03:00
Comicao1
a4fa7a2d68 Cleans a few things 2023-02-08 19:17:21 -03:00
Comicao1
cb355bd50f A few requested things 2023-02-08 18:18:09 -03:00
WoolyAypa
8ebd985f4b fixar 2023-02-07 22:21:21 -03:00
BongaTheProto
79e84f961a le chars tm
how do you even reach the saves limit brah
2023-02-07 18:31:55 -05:00
BongaTheProto
ef0b7ead34 snekkk
snek tail by mayhem™️
2023-02-07 18:31:55 -05:00
Comicao1
2141ebc0cb Modularized 2023-02-07 20:27:01 -03:00
Comicao1
4722e7b54b Opsie 2023-02-07 18:45:23 -03:00
Comicao1
9feb3c31c8 Bounty beachball 2023-02-07 18:30:00 -03:00
BongaTheProto
f5b1fab9be Merge pull request #723 from The-Real-Goku/photography-update
Photography update
2023-02-07 15:57:53 -05:00
BongaTheProto
21566c5a1b Merge pull request #645 from LeDrascol/unrestricted-light-replacer
Add Bluespace Light Replacer to Science protolathe
2023-02-07 15:29:35 -05:00
Comicao1
cf889118a3 bounty inflate belly verb 2023-02-07 16:41:14 -03:00
WoolyAypa
524525c5f5 dull han 2023-02-07 12:03:17 -03:00
zerothebigboy
58fa2127bc okay 2023-02-07 09:45:54 -05:00
BongaTheProto
f538e07ca0 Merge pull request #707 from LeDrascol/quirk-fixes-werewolf
Werewolf quirk improvements
2023-02-07 06:56:15 -05:00
Darius
552585ebfc Add eye type support to werewolf quirk
Updates the Werewolf quirk to record and restore custom eye types.
2023-02-06 21:15:06 -05:00
BongaTheProto
e7f1a19d4a Merge pull request #728 from AshTheDerg/AshieDrinkProjectPt1
More Drinks Part 1
2023-02-03 21:40:03 -05:00
BongaTheProto
2eccd56e6b Merge branch 'master' into pr/660 2023-02-03 19:48:12 -05:00
BongaTheProto
3b04a3e938 Merge pull request #727 from LeDrascol/verb-subtle-indicator
Add variant Subtle verb with typing indicator
2023-02-03 19:42:54 -05:00
Darius
c816746196 Update verb name for subtle_indicator
Changes the subtle_verb indicator to use proper case.
2023-02-03 19:28:32 -05:00
BongaTheProto
0e1c099482 Merge pull request #729 from LeDrascol/brain-trauma-toys
Add roleplay brain trauma toys
2023-02-03 17:59:46 -05:00
Darius
16ddb0ceb8 Remove useless werewolf quirk parent returns
Removes useless 'funny BYOND dots' from werewolf quirk definition.
2023-02-03 17:37:19 -05:00
Darius
43b693e341 Werewolf body swapping fixes
This commit does the following
- Add species name prefix for slime species
- Moves old feature list from action to quirk
- Moves action grant from add to post_add
- Fixes losing species data on body change
2023-02-03 17:35:16 -05:00
Darius
e97be91375 Add werewolf support for tauric body
Allows werewolves to become were-taurs if the original character had a tauric body.
2023-02-03 16:51:24 -05:00
Darius
e12ca4c0e5 Restore hexacrocin interaction with estrous
Restores reagent interaction between hexacrocin and the In Estrous quirk. User will be granted the quirk on overdose start.
2023-02-02 19:25:59 -05:00
Darius
12a4e02adf Merge branch 'master' into remove-quirk-heat 2023-02-02 19:25:23 -05:00
Darius
3e520ed98d Add jelly person checks to werewolf
Prevents species change trigger if user is a jelly.
2023-02-02 18:03:23 -05:00
BongaTheProto
ecbdca7eb4 Merge pull request #720 from LeDrascol/update-hypnotic-gaze
Hypnotic Gaze quirk improvements
2023-02-02 17:41:16 -05:00
Darius
157db709ef Remove obsolete heat quirks
Removes quirks In Heat and Estrus Detection, which were merged upstream into Sandstorm.
2023-02-02 15:52:31 -05:00
Darius
16b52833ef Allow Science access to BSLR
This does the following
- Adds Science access to the Bluespace Light Replacer
- Reverts general access to the Light Replacer
2023-02-02 00:24:14 -05:00
Darius
006202c2e2 Merge branch 'master' into unrestricted-light-replacer 2023-02-02 00:14:41 -05:00
Darius
fce50e1b81 Add roleplay brain trauma toys
Adds arcade machine prizes that grant roleplay-oriented brain traumas; Split Personality and Imaginary Friend. Each item is single use.
2023-02-01 16:31:48 -05:00
AshTheDerg
f98127e419 More Drinks Part 1
Adds 10 new types of Milkshakes
2023-02-01 05:41:58 -05:00