113 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub 0a564a92e7 Merge pull request #1127 from liz-lavenza/fix/harddels-one
[TESTMERGE] Fix a number of harddels
2024-03-31 21:15:28 -05:00
Elizabeth Lavenza bbcc0920ea Fix blood causing harddels. 2024-03-29 17:22:50 -04:00
BongaTheProtoandGitHub 6e731fa004 Merge pull request #1103 from miguelop1/Semen_female_ejaculate_Synth
[NON-MODULAR] Fix limbgrower missing species limbs, added synthetic semen and female ejaculate
2024-03-28 15:33:09 -05:00
MR.Sasma 7b2546b609 Update drink_reagents.dm 2024-03-24 15:25:32 +00:00
MR.Sasma 26ab81339c Update2 2024-03-08 14:06:53 +00:00
MR.Sasma beeceea286 Update1 2024-03-08 13:09:58 +00:00
MR.Sasma 37d2dd4033 Update others.dm 2024-03-08 02:52:25 +00:00
MR.Sasma 2d462cabcc [Work in progress] Donator drink
That's it.
2024-03-08 02:25:13 +00:00
MR.Sasma 0ccdbbac84 update
Small update
2024-03-07 18:57:22 +00:00
MR.Sasma 54d7e5237c limbgrower_Fix_+_added_reagents
As name says lol (Fixed code so you can now print three more races bodyparts)
2024-03-07 17:00:21 +00:00
ariaworld 22befe7327 Winter QOL 2023-12-23 14:59:11 +01:00
BongaTheProto 35c3dd0288 salvaging
yippee
2023-09-05 18:14:31 -05:00
BongaTheProto 70fce668c5 what's next? your tits feel full again?
old players will remember this verb
2023-07-18 17:57:18 -05:00
Zattarra ed1e1bc6eb Adds first implementation of Hallowed quirk. 2023-06-11 21:45:59 +09:00
WoolyAypa 36f8a4ea71 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-04-26 16:12:15 -03:00
CreepingRose bdb6008f74 Adds the Ultimate Spray Bottle, a 750u bottle sprays 5 tiles away. Additionally makes the Bluespace Spray Bottle printable in the Service Techfab 2023-04-03 18:31:14 -04:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03:00
BongaTheProtoandGitHub 0c01f49a4b Merge pull request #761 from LeDrascol/refactor-internal-fluid-list
Refactor organ fluid whitelist code
2023-03-10 23:01:36 -05:00
BongaTheProtoandGitHub db48587b4d Merge pull request #752 from LeDrascol/vampire-overhaul-2
Bloodsucker Fledgling Overhaul: Part 2
2023-03-07 00:23:21 -05:00
Darius 6737b2a1ce Merge branch 'master' into vampire-overhaul-2 2023-02-23 00:40:22 -05:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
Darius 7c450a0c44 Merge branch 'master' into refactor-internal-fluid-list 2023-02-18 12:27:04 -05:00
BongaTheProtoandGitHub 6dc34f861b Merge pull request #756 from KeplerWasTaken/ionmixesanewdrink
The Ion Storm!
2023-02-17 20:30:29 -05:00
Darius 8606b63808 Use quirk check for Hexa-chem overdose
Converts the usage of Hexacrocin and Hexacamphor overdose trait checks to quirk checks, to prevent cases where a trait may have been assigned without the associated quirk.
2023-02-17 14:39:24 -05:00
Darius b3be3274c7 Minor Hexa overdose refactors
Refactors the overdose triggers for Hexacrocin (`aphrodisiacplus`) and Hexacamphor (`anaphrodisiacplus`), and adds logging to failure events.

Adds the ability for Hexacamphor overdose to remove the In Estrous quirk, as a counter to it being added by Hexacrocin.
2023-02-17 14:19:15 -05:00
Darius 59c33ba008 Update organ fluid whitelist with feedback
Whitelists various reagents for the organ fluid list, and allows for any manually added reagent to bypass the rarity and booze power checks.

Adds a new variation of Copium - used for organ fluids - with a value of REAGENT_VALUE_COMMON, to follow value standards from `reagents.dm`.
2023-02-16 23:09:41 -05:00
Darius d8deea248c Buff blood to notriment ratio
Increases the conversion rate from Blood into Strange Nutriment from 10% to 50% to prevent cases of too little nutrition being added.

Increases the nutriment factor from 4 (10 * REAGENTS_METABOLISM) to 5, and the metabolization rate from 0.4 to 1.

Maximum nutrition level possible from Strange Nutriment is now NUTRITION_LEVEL_FAT, after which no further nutrition can be added.
2023-02-16 22:35:16 -05:00
Darius d31efdfa5d Bloodfledge nutrition fixes
The following is changed for Bloodlfedge Bite action:
- Add reagent holder variable
- Add reaction type (INGEST) to reagent transfer
- Refactor transfer/nutrition state checks

The following is changed for Strange Reagent:
- Add logging for blood with no data
- Reduce amount granted by blood to 10% of reaction volume
- Move `NO_PROCESS_FOOD` check from `on_mob_life` to `reaction_mob`
2023-02-14 06:09:44 -05:00
KeplerWasTaken 42db3cb76d Added a new drink, the ion storm 2023-02-14 09:41:03 +01:00
Darius 1306abf8d5 Earlier blood reaction data check
Moves the blood ingestion data check before the quirk bloodfledge check.
2023-02-12 11:07:18 -05:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
WoolyAypa f8b3325133 chem check 2023-02-11 18:47:45 -03:00
WoolyAypa e4d35beb7d hope it works 2023-02-11 16:28:54 -03:00
Darius 9372bf073e Bloodfledge reagent processing fixes
This commit does the following
- Adds a new reagent: Strange Nutriment
- Adds reaction_mob effect for blood
- Adds check for ingesting blood
- Adds check for using a mob's own blood
- Removes trailing whitespace
2023-02-10 15:35:05 -05:00
Darius bcf5904b6c Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-08 21:49:37 -05:00
Darius 8f8d521365 D4C quirk parity improvements
This commit makes the following changes:
- Added pacifism trait to D4C craving
- Added D4C craving text to illiteracy warning
- Updated text for cum_stuffed mood event
- Updated D4C craving removal to trigger regardless of timer
- Fix incorrect type assignment for craving trait removal

Adds Dumb For Cum quirk craving checks to:
- Mob proc can_read
- PDA send_message
- PDA receive_message
2023-02-06 20:21:12 -05:00
BongaTheProtoandGitHub 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 f2cf15c590 Refactor Dumb For Cum quirk
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
2023-02-02 17:21:54 -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
AshTheDergandGitHub 221283c313 Borg Shaker Fix 2023-01-27 15:12:54 -05:00
AshTheDergandGitHub df98398060 Borg Shaker Fix 2023-01-27 14:00:50 -05:00
AshTheDergandGitHub b3a4d968ba More Shaker Fix 2023-01-27 13:35:20 -05:00
AshTheDergandGitHub 6e67b60d6e Borg Shaker Fix
I fix it.
2023-01-27 13:23:25 -05:00
BongaTheProtoandGitHub 5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul
Bloodsucker Fledgling quirk overhaul
2023-01-24 13:10:44 -05:00
BongaTheProtoandGitHub 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
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00