Commit Graph

1420 Commits

Author SHA1 Message Date
Darius
70d9fef21d Add subtle with typing indicator
This commit adds a variant of the subtle verb that uses a typing indicator, and replaces the original key binding with it.
2023-02-01 00:29:03 -05:00
BongaTheProto
6bcfacb031 Merge pull request #724 from LeDrascol/cheaper-condoms
Reduce condom prices
2023-01-30 22:46:20 -05:00
Darius
98cb3d661c Add gendered species names for Werewolf quirk
Werewolves now get a custom species name based on their chosen gender. Name prefixes used are based on Old English terms for Man, Woman, Person, and Object.
2023-01-30 18:31:56 -05:00
BongaTheProto
7ebdfba5c9 modularize
yep
2023-01-30 17:57:24 -05:00
BongaTheProto
e13ec21ba0 followup 2023-01-30 17:02:54 -05:00
Darius
3851370f89 Reduce condom prices
Sets a price for the condom item at PRICE_CHEAP_AS_FREE (10 credits), and updates the price for surplus condom box item to PRICE_BELOW_NORMAL (80 credits).
2023-01-30 16:52:52 -05:00
BongaTheProto
96703f76bc Modularize 2023-01-29 12:37:39 -05:00
Darius
a0f936804e Add werewolf ability cooldown
Converts the werewolf quirk actions to a subtype of action cooldown, and assigns a five second cooldown. This prevents spamming the ability.

Restraint check has been moved to a separate check to provide better feedback.
2023-01-29 12:30:45 -05:00
Moribun
ec97ed015d stuff added
*ported tail from my server of the nightstalker variety

*unfucked zombo's not being able to get blood back

*made vault suit digigrade compatible
2023-01-29 07:24:12 -06:00
Darius
3b0557d7ed Improve werewolf ability trigger condition checks
This commit does the following:
- Adds check_flags for restrained, stunned, unconscious, or dead
- Adds a return check for if the action is unavailable
- Removes the consciousness check
2023-01-28 22:22:56 -05:00
BongaTheProto
8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
Darius
89aac16dc2 Werewolf appearance updates
Updates werewolf body part usage as per a suggestion by user Mossy.
2023-01-28 20:35:38 -05:00
Darius
3d88865d0e Fix for werewolf custom species text
Updates the Werewolf quirk to properly record and restore custom species text when using the transform quirk action.
2023-01-28 11:38:41 -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
AshTheDerg
e7e8b422b4 Bork Shaker fix
I broked it.
2023-01-27 13:22:23 -05:00
AshTheDerg
4f4108d934 Merge branch 'SPLURT-Station:master' into patch-3 2023-01-27 13:17:09 -05:00
AshTheDerg
ce762c376c Fix broken beer shaker
I broke the beer shaker. This SHOULD fix it.
2023-01-27 04:37:59 -05:00
BongaTheProto
7207f6fb74 Merge pull request #718 from AshTheDerg/patch-3
Borg Beer Shaker drink add
2023-01-26 23:29:20 -05:00
BongaTheProto
e3d35f46aa Merge pull request #713 from Kush1Push1/splurt_pilot
Pilot and pilot jaw body markings
2023-01-26 16:45:35 -05:00
Darius
6e29846d83 Improvements to hypnotic gaze checks
This commit does the following
- Adds checks for the following
- - Combat mode
- - Eye protection
- - Covered eyes (Unused)
- - Blindness
- - Valid mind
- - Anti-magic (excluding holy)
- - Cyborg target
- - Alien target (Unused)
- Adds a sound effect on successful triggering
- Converts carbon check to human check
- Moves the grab check after the living and carbon checks
2023-01-26 12:54:48 -05:00
Darius
8b9ee5af3d Merge branch 'master' into quirk-fixes-werewolf 2023-01-26 09:38:22 -05:00
BongaTheProto
2aa678176e Merge pull request #600 from ShamanSliph/cloth-eater
New Quirk: Clothes Eater and Fixes Insects chewing clothes
2023-01-26 01:39:16 -05:00
AshTheDerg
e0f9978a11 Borg Beer Shaker additions 2023-01-26 01:10:01 -05:00
AshTheDerg
a2df6d6143 Borg Beer Shaker drink add
Adds some extra drinks to the Borg Beer Shaker
2023-01-26 00:59:34 -05:00
Darius
7fb08fbabd Improvements for Hypnotic Gaze quirk
This commit makes the following changes
- Adds comments
- Adds feedback for all fail conditions
- Adds pronoun support
- Adds check for mindshield
- Adds check for sleep immunity
- Adds check for carbon target
- Adds check for non-con preference
- - This allows skipping the consent prompt
- Reduces action time from 12s to 5s
- Reduces the required number of user inputs
- Updates variable names to match standards
- Updates hypno pref check to use NEVER_HYPNO
- Refactors code order and indentation
2023-01-25 23:22:50 -05:00
BongaTheProto
4bba867c36 Merge pull request #712 from Kush1Push1/splurt_beak
Corvid beak
2023-01-25 22:47:11 -05:00
BongaTheProto
4b502c8e17 Merge pull request #703 from LeDrascol/techweb-move-rack
Move Research Rack to Biological Technology
2023-01-25 18:16:43 -05:00
BongaTheProto
2bb3832f37 Merge pull request #716 from LeDrascol/remove-dnc
Remove redundant use of quirk DNC
2023-01-25 18:02:51 -05:00
Darius
9260df751e Merge branch 'master' into quirk-fixes-werewolf 2023-01-25 17:21:57 -05:00
Kush1Push1
f76d765d55 A fix 2023-01-25 22:06:54 +07:00
BongaTheProto
5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul
Bloodsucker Fledgling quirk overhaul
2023-01-24 13:10:44 -05:00
Kush1Push1
e42c2f1a1d Initial 2023-01-24 22:13:30 +07:00
Kush1Push1
fa2047291d initial 2023-01-24 22:08:42 +07:00
BongaTheProto
9d1aaabc97 Merge pull request #711 from LunarFleet/let-them-bake-cake
Allow service borgs to cook
2023-01-23 17:37:09 -05:00
Darius
589ecf7db9 Add Cursed Blood integration to Bloodfledge bite
Adds an integration between Bloodsucker Fledgling that gives a positive or negative mood to the quirk holder when biting a target with cursed blood, depending on if the quirk holder also has cursed blood.
2023-01-23 17:34:37 -05:00
LunarFleet
5dd2d46f96 Yes M'lord 2023-01-23 17:25:07 -05:00
Darius
eae8012fa5 Improve werewolf quirk mammal check
This commit updates the werewolf quirk mammal species check to check subtypes. This fixes undead mammal being missed by the checks, and improves compatibility with other potentially overlooked subtypes.
2023-01-23 09:22:42 -05:00
Darius
5fd92b553e Werewolf quirk species checks
This commit does the following:

- Don't change owner species if already anthro or synth anthro
- Record starting species when transforming

This fixes the organ reset exploit for anthro and synth anthro races, and fixes the species reset for all races.
2023-01-23 06:53:56 -05:00
LunarFleet
0bf3a67cee Bake maxxing 2023-01-23 03:54:38 -05:00
LunarFleet
356dd7a8cd Agony 2023-01-22 21:35:52 -05:00
Darius
67b39914bb Fix mood event newlines
Restores missing newline markers to modular mood events. These were lost during a replacement of HTML spans. Also adds the missing span to mood event `cum_craving`.
2023-01-22 14:43:52 -05:00
BongaTheProto
b00ac4b59e Merge pull request #708 from WoolyAypa/Holy-Clothing-Stuff
[BOUNTY] Null Rod and Armory Beacon styles
2023-01-22 12:31:30 -05:00
Darius
d7997fbdf9 Remove quirk DNC
Removes the DNC quirk, as the upstream merge makes it redundant.
2023-01-22 11:44:54 -05:00
WoolyAypa
43c362f84f ahem.. 2023-01-21 20:21:50 -03:00
WoolyAypa
32b2af9b8b newline! 2023-01-21 20:20:08 -03:00
WoolyAypa
3a4645d960 descriptions, yeaaah i don't know history 2023-01-21 20:19:02 -03:00
WoolyAypa
3c86dada16 yey 2023-01-21 19:56:10 -03:00