Commit Graph

400 Commits

Author SHA1 Message Date
BongaTheProto
bb3bdf047f Merge pull request #738 from WoolyAypa/dullahan
dull han fixxe
2023-02-12 01:09:24 -05:00
BongaTheProto
8ea5c66e65 Merge pull request #739 from Comicao1/inflate
bounty inflate belly verb
2023-02-09 16:50:35 -05:00
WoolyAypa
8ebd985f4b fixar 2023-02-07 22:21:21 -03:00
BongaTheProto
f5b1fab9be Merge pull request #723 from The-Real-Goku/photography-update
Photography update
2023-02-07 15:57:53 -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
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
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
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
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
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
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
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
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
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
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
BongaTheProto
5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul
Bloodsucker Fledgling quirk overhaul
2023-01-24 13:10:44 -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
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
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
Darius
d7997fbdf9 Remove quirk DNC
Removes the DNC quirk, as the upstream merge makes it redundant.
2023-01-22 11:44:54 -05:00
Darius
41c253b835 Fix werewolf transformation message oversights
Fixes oversights in the werewolf quirk text variable that caused:
- Enable and disable messages to become reversed
- Personal pronouns to use defaults
2023-01-21 14:07:39 -05:00
Darius
45039092e5 Werewolf quirk improvements
This is not a comprehensive overhaul. It does not fix the organs bug.

Changes the following:
- Adds TRAIT_WEREWOLF
- Adds gain and lose text
- Adds medical text
- Adds comments
- Removes unnecessary mob defines
- Reduces description text length
- Separates transform into a sub-action
- Updates ability tooltip text to improve descriptiveness
- Blocks transformation while user is not conscious
2023-01-21 13:42:16 -05:00
Darius
c46ee2a818 More bloodfledge revival checks
Adds revival ability checks for TRAIT_NOCLONE and hellbound. These are both conditions that prevent all forms of revival, even for vampires.
2023-01-21 10:34:54 -05:00
Darius
4460d9f724 Remove bloodfledge chapel checks
Removes chapel checks and penalties from bloodfledge quirk code. Chapels are an underused portion of the station, and quirk served to increase the problem. The behavior was also inconsistent with actual bloodsuckers, and did not fit the "half vampire" theme.
2023-01-20 09:57:06 -05:00
Darius
bd8d7673f8 Minor improvements for bloodfledge ID
Updates the Bloodfledge ID Card with behavior similar to heirlooms. Fixes an issue where the card could be lost due to a full starting backpack.

- Adds a notice in chat about the ID
- Removes the regenerate icons trigger
- Changes ID spawn location to the floor
- Changes equip type to 'if possible' variant
- Fixes some spacing issues
2023-01-19 09:12:26 -05:00
Darius
59b3c5bd7a Merge branch 'master' into quirk-bloodfledge-overhaul 2023-01-17 19:51:27 +00:00
Darius
759f208901 Bloodfledge revival improvements
- Added support for revival policy
- Added check for max revive brute damage
- Added check for max revive fire damage
- Added redundant check for revive (for chat output)
- Added revival sound effect
- Removed health threshold check
- Improved logging with death time and policy information
2023-01-17 14:26:00 -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
19980ae75c Bloodfledge span standards compliance
Converts all HTML spans to defines spans for files updated in the quirk overhaul.
2023-01-16 03:46:39 -05:00
BongaTheProto
d8141d260e Merge branch 'master' into pr/600 2023-01-16 02:31:47 -05:00
Darius
2118b148e4 Bloodfledge ID improvements
- Flavor text consistency improvements
- Automatically link to the holder's account
- Added a job assignment
- Prevent overlays from applying
- Modularized and recreated icon
2023-01-15 02:13:47 -05:00
Darius
98f0a93719 Fix issues with coffin healing
- Fixes an escape clause preventing coffin healing
- Fixes duplicate use of burn healing
- Updates user's health after healing
- Removes unused return statement
- Prevent robotic mobs from coffin healing
- - This caused issues with heal_overall_damage, oxygen, and toxin
- Raises the chance of healing failed messages
- Removes the 50% reduction on healing nutrition cost
- Minor execution order refactoring
2023-01-14 23:56:16 -05:00
Darius
836259c44f More bloodfledge bite interaction updates
- Drinking from in invalid species doesn't grant blood
- Mood penalty for draining slimes
- - Ignored if the user is also a slime
- Penalty for drinking from zombies (same as corpses)
- - This is not ignored if the user is a zombie too
- Slimes and synths can drink from their own kind
- - This grants slime or coolant respectively, instead of nutrition
- Blood type taken is now reflected in chat messages and combat log
- Fixes the penalty check for fully draining
- Alerts the user if a non-nutrition blood transfer exceeds their maximum blood volume
2023-01-14 21:06:12 -05:00
BongaTheProto
d330a7c498 Merge branch 'master' into pr/673 2023-01-14 16:01:59 -05:00
Darius
0aaa165dec Interaction spelling fixes
Fixes simple spelling errors in the player interactions list. Requested by another user.
2023-01-13 22:47:06 -05:00
Darius
b570d86f2b Bloodfledge chapel penalty tweak
Increases the stamina penalty limit, and increases the penalty amount to out-pace the regen. This prevents the penalty from becoming too negligible.
2023-01-13 19:16:58 -05:00
Darius
115c9ad2ad Bloodfledge overhaul continued
Continues overhaul started in the first commit.
2023-01-13 17:18:02 -05:00