Commit Graph

1420 Commits

Author SHA1 Message Date
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
aeda5081b5 Move research rack techweb node
Changes the Research Rack techweb node from Data Theory to Biological Technology. This change is made to fit the theme of "specimen research" being a medical study.
2023-01-21 03:39:24 -05:00
zeroisthebiggay
5cdd3aeda3 Update splurt_emotes.dm 2023-01-20 22:41:52 -05:00
BongaTheProto
3e5b3bbb0e Merge pull request #699 from LeDrascol/boxed-condoms
Adds the surplus condom box
2023-01-20 12:47:07 -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
1e73c788df Add condom box to loadouts
Adds a surplus condom box to the loadout selection, under the backpack tab.
2023-01-20 05:12:00 -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
BongaTheProto
2513a9894e Merge pull request #690 from LeDrascol/merged-drink-sprites
Deduplicate ported TG drink sprites
2023-01-19 16:22:35 -05:00
Darius
c73684db34 Adds the surplus condom box
Adds a box of ten condoms to the kinkmate vendor, priced at half the cost of buying all ten individually.
2023-01-19 12:44:27 -05:00
Darius
48a7c44dd8 Fix typos in clothing files
Fixes various typographical errors in the modular clothing files.
2023-01-19 10:45:59 -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
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
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
JimmyDrop
82fddac441 Small batch of clothes
Im not sure what else needs to be done. Looking around I can't find any more items that need to be specified. But its possible I missed some.
2023-01-17 12:32:29 -05:00
Darius
2c2493225e Deduplicate TG drink sprites
Removes drink sprite entries that were merged upstream.
2023-01-16 23:16:35 -05:00
BongaTheProto
19fe5cf1ef Merge pull request #688 from LeDrascol/span-standardization
Replace all modular HTML spans with defines spans
2023-01-16 22:53:48 -05:00
BongaTheProto
1c0c91faf6 Merge pull request #669 from Kush1Push1/splurt_keybinds
Keybinds for suit storage and pockets
2023-01-16 22:49:51 -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
BongaTheProto
5e784f40b7 thibgies
yeee
2023-01-15 16:51:04 -05:00
Darius
12d31faecb Prevent bloodfledge power cord exploit
Stops bloodfledges from using the power cord implant to gain nutrition, as this would negate all quirk balancing. Synthetic races start with this implant by default.
2023-01-15 02:35:05 -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
BongaTheProto
34507c49b6 Update _under.dm
don't let the traditions die
2023-01-14 21:18:48 -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
Casper
e676baff0e Stops TK users from teleport to a pole. 2023-01-14 22:37:52 +00:00
BongaTheProto
a23bafa37f Merge pull request #684 from LeDrascol/bluespace-wallet
Adds the Wallet of Holding
2023-01-14 16:30:08 -05:00
BongaTheProto
d330a7c498 Merge branch 'master' into pr/673 2023-01-14 16:01:59 -05:00
BongaTheProto
e094d993e0 Merge pull request #682 from LeDrascol/plushmium-crate-update
Plushmium crate improvements
2023-01-14 15:44:18 -05:00
Darius
7ca55c7e37 Adds the Wallet of Holding
Functions like a normal wallet, but with 3x more space. Included in Bluespace Pockets, and available from a science protolathe.
2023-01-14 06:19:54 -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
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
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
BongaTheProto
c7b89635c6 Merge branch 'pr/652' 2023-01-13 18:40:27 -05:00
BongaTheProto
df785546f4 Merge pull request #668 from Guatolipo/patch-1
chemistry access added to Med-U DELUXE cartridge
2023-01-13 18:23:06 -05:00
Darius
115c9ad2ad Bloodfledge overhaul continued
Continues overhaul started in the first commit.
2023-01-13 17:18:02 -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
8710e7ed06 Fixes a typo for gargoyle quirk
Adds a missing slash to the gargoyle quirk's pause action

Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
2023-01-12 07:25:14 +00:00
Darius
dc138b1fad Move quirk actions to separate file
Moves all quirk action datums to a separate file, to reduce bloat in the main trait files.
2023-01-11 19:48:13 -05:00
JimmyDrop
d330a9eb43 Hopefully Fixed Mob_holder
Added a new check for is_edible = -1. This is for "clothes" that shouldn't either eaten at all. Stuff like Mob_holder and Micro_holder. I don't know any other weird "clothes" So Ill have to be on the lookout for those.
2023-01-11 18:19:05 -05:00
BongaTheProto
91e2277311 Merge pull request #664 from Seris02/gargoylebetter
sanity, fixes and qols for gargoyles
2023-01-11 16:03:54 -05:00
BongaTheProto
d972b715e2 fixes our reskins
btw cit's prs aren't making any changelogs for some reason just fyi
2023-01-11 13:44:42 -05:00
Darius
a1a35ad4ef Convert disrobe implant to use LPD
Updates the Rapid Disrobe implant to use the LPD clothing burst effect, and slightly updates the flavor text.
2023-01-10 17:59:13 -05:00