Commit Graph

72 Commits

Author SHA1 Message Date
BongaTheProto
e7f1a19d4a Merge pull request #728 from AshTheDerg/AshieDrinkProjectPt1
More Drinks Part 1
2023-02-03 21:40:03 -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
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
AshTheDerg
f98127e419 More Drinks Part 1
Adds 10 new types of Milkshakes
2023-02-01 05:41:58 -05:00
AshTheDerg
221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDerg
df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDerg
b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDerg
6e67b60d6e Borg Shaker Fix
I fix it.
2023-01-27 13:23:25 -05:00
BongaTheProto
5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul
Bloodsucker Fledgling quirk overhaul
2023-01-24 13:10:44 -05:00
BongaTheProto
0d05b7eaa5 Merge pull request #692 from LeDrascol/prefs-lpd-drink
Check client prefs before triggering LPD drink
2023-01-19 16:32:14 -05:00
Darius
4d32b000a5 Check client prefs before triggering LPD drink
Updates Liquid Panty Dropper's drink effect to check the client's preferences for ERP and aphrodisiacs before triggering. Setting either to disabled will return with no effect.
2023-01-19 02:50:26 -05:00
Darius
da942dc740 Remove unnecessary drink icon variables
Removes unnecessary duplicate drink icon definitions for ported TG drink icons that were merged upstream.
2023-01-19 02:11:44 -05:00
Darius
24f3acb736 Merge branch 'master' into merged-drink-sprites 2023-01-18 05:35:59 -05:00
Darius
59b3c5bd7a Merge branch 'master' into quirk-bloodfledge-overhaul 2023-01-17 19:51:27 +00:00
Darius
2c2493225e Deduplicate TG drink sprites
Removes drink sprite entries that were merged upstream.
2023-01-16 23:16:35 -05:00
Darius
ad0239b5de Replace all modular HTML spans with defines spans
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
2023-01-16 04:05:27 -05:00
Darius
64ef8148c8 Plushmium crate updates
- Reduces the amount from 30 to 5
- - Allows converting only one plushie per shipment
- Adds a spray bottle variant
- Prevents using the spray bottle on non-plushies
- Adds a boxed set for the items
- Adds a lore note explaining how to use it
- Updates shipment information
2023-01-13 21:40:21 -05:00
Darius
56e43c9879 Bloodsucker Fledgeling overhaul
This commit refactors most of bloodfledge's code, adjusts balance, and adds new features. See the associated PR for full details.
2023-01-13 05:06:31 -05:00
BongaTheProto
d4c5a3f0d7 Merge pull request #676 from LeDrascol/cargo-crate-plushmium
Adds a Plushmium Crate
2023-01-12 13:25:24 -05:00
Darius
c8acb8c218 Adds a Plushmium Crate to cargo
Adds the new Plushmium Crate, which contains a bottle of Plushmium and a plushie choice box. Also adds an item for the Plushmium Bottle, so it can be in the crate.
2023-01-10 14:28:51 -05:00
Darius
96bd348f1b Update LPD drink effects
- Ignores held items
- Only plays rip noise once
- Displays a different chat message for the target user
- Items are thrown, instead of dropped
- Moves functional code from alcohol_reagents to a mob proc
- - This change is made so other items can use the effect
2023-01-10 13:15:30 -05:00
KeplerWasTaken
ce4f0d9233 Fixed github destroying code over merge conflict fixing, thanks github 2023-01-01 14:03:10 +01:00
KeplerWasTaken
eb3525ddc0 Merge branch 'master' into master 2023-01-01 01:08:25 +01:00
KeplerWasTaken
53dfc5a504 Added stimulants as a requirement for Moth in Chief, and it now has it's full effects 2022-12-31 23:53:14 +01:00
KeplerWasTaken
028e83a6be Nerfed Moth in Chief stimulant effects 2022-12-31 12:05:09 +01:00
BongaTheProto
e39fde7a73 radioactive rainbow puke
Adds Aerie#0069's donator drink since they already had a sprite for it
2022-12-30 14:14:00 -05:00
KeplerWasTaken
13c6a9f07b Buffed the moth in chief to be an even better version of the commander and chief 2022-12-26 08:30:43 +01:00
Darius
39ff3eeb2f Refactor cursed blood effect into modular
Moves TRAIT_CURSED_BLOOD effects into modular code. Makes change to holy water and blood drunk miner.
2022-12-18 18:26:38 -05:00
BongaTheProto
155e872fbb better
b
2022-10-17 20:05:26 -05:00
catrock31
43e178b6f6 fixes a small problem 2022-10-17 00:27:11 -04:00
catrock31
eb036115f8 makes the cum bar drink affect the cum based quirks 2022-10-16 16:04:54 -04:00
Nukechickenu64
6f754bc4e5 increase nutrition given a little bit
should make it easier to go without cum for a little longer
2022-10-13 21:29:17 -04:00
Nukechickenu64
f945deb3f7 Merge remote-tracking branch 'upstream/master' into nukechickens_forge2 2022-10-11 15:47:54 -04:00
Nukechickenu64
fa7abd3f34 utter overhaul
overhauls nearly everything
2022-10-08 05:51:22 -04:00
Nukechickenu64
1f5387607f value adjust
adjust some values and fix my dumness
2022-10-07 05:50:01 -04:00
Nukechickenu64
3e79d61370 adds incubus and succubus quirks
incubus needs to eat milk and succubus needs to eat milk, they are compatible with each other and #519
2022-10-07 05:10:13 -04:00
Nukechickenu64
ba78628368 fixes 1
simple fixes
2022-10-05 23:04:58 -04:00
Nukechickenu64
37fd47d8f7 modulizing 6
should be the final commit that modulizes as much as possible
2022-10-05 18:44:50 -04:00
Aypa
d4799f2b1b newlinezzzz 2022-08-21 22:52:00 -03:00
Aypa
d093323b82 modularizzzzz 2022-08-21 22:32:21 -03:00
Aypa
e004e205fb le recipes and more food reagents (for later) 2022-08-21 18:05:17 -03:00
Aypa
7b3658f229 sip sip sip 2022-08-21 18:02:06 -03:00
BongaTheProto
bf2cd05560 lewd medipens
adds lewd donator medipens like that one donator asked for
2022-08-14 03:31:20 -05:00
BongaTheProto
d2e24e63b9 drinks
~
2022-07-01 00:37:11 -05:00
BongaTheProto
b3fa2b31cb dring 2022-06-29 00:03:10 -05:00
WoolyAypa
438bc50757 what even is a trailing newline? 2022-06-17 14:14:15 -03:00
WoolyAypa
9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
BongaTheProto
8aaccc6007 fixes some bugs with LPD
this gave me the idea (or made me remember the suggestion) of a nudist quirk
2022-05-26 23:20:28 -05:00
BongaTheProto
98a41c8356 can't believe the LPD did not drop panties!
You only had one job! (it will do it this time though)
2022-05-23 08:47:23 -05:00
BongaTheProto
7dae47e521 I guess lean was too much
yeah
2022-05-02 17:56:12 -05:00