Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bounty] Fixes portal accessory behaviour #784

Merged
merged 21 commits into from
Jun 4, 2024

Conversation

Azarak
Copy link

@Azarak Azarak commented Mar 8, 2023

About The Pull Request

Implemented to do the bounty #779
This fixes portal fleshlight sex behaviour to cum inside your partner.

The fix was implemented by adding a new argument to the sex proc chain, and using that as a basis for a determining whether an entity will cum inside, rather than FALSE. It still becomes overriden by the existing logic if the logic desires - no other behaviours are changed.

This argument can be also used to tweak other interactions easily

dreamseeker_gr5e4cbGPf
dreamseeker_w2kHZMIBJM

Update:
I have fixed weird arguments with the mob_climax_partner proc, which could be a cause for a runtime.
I have added an anonymity feature to the climax proc chain, and made the portal fleshlights use it
The anonymity feature obstructs information about who climaxed into who in messages, to faciliate portal fleshlight intended behaviour

dreamseeker_aK7FuumwlY

Why It's Good For The Game

Bugs are bad

A Port?

No

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
fix: Portal fleshlight orgasms will now cum inside your target
/:cl:

@MosleyTheMalO
Copy link

could you maybe mark the edits made to modular_sand/code/datums/interactions/lewd_definitions.dm as SPLURT EDIT so we more easily know that those lines have been edited?

@Azarak
Copy link
Author

Azarak commented Mar 10, 2023

could you maybe mark the edits made to modular_sand/code/datums/interactions/lewd_definitions.dm as SPLURT EDIT so we more easily know that those lines have been edited?

Done!

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

SPLURT

Revision

Origin: 1213be1
Pull Request: 11eb82b
Server: 1133582383405d4596e46e1ff8ab70c1ad292ee8

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 9dc48b5
Pull Request: 11eb82b
Server: 581a5296b02cba13423337fe8ea6269cfe54590a

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 017c235
Pull Request: 11eb82b
Server: ae7ec19254c67f607b087e77c1a4396ae12d67f5

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 6dfb1ca
Pull Request: 11eb82b
Server: 2a770cba316ecadffda5dcac11e0bd5b15e5e263

@Azarak
Copy link
Author

Azarak commented Mar 18, 2023

Someone pointed to me that this failed to work - I have investigated and found out an error with the arguments for mob_climax_partner which could be responsible for a runtime

I have fixed the arguments in the procs/calls to that

I have also been notified that there should be anonymity regarding who is using the device when they climax, I have added such feature aswell

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 03dabb3
Pull Request: 11eb82b
Server: a20e094818baa13bc2dfda4714be70d7aaf8716e

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 99a6b05
Pull Request: 11eb82b
Server: 867773375e7d632888b1a68d5f570010d3266613

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 5618e8e
Pull Request: 11eb82b
Server: 2ea184dab033d5dbeb19011a4e13074e2731bdea

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 164923c
Pull Request: 11eb82b
Server: a34b79fa6f843662df68858add44c875068af592

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: f4323c4
Pull Request: 313e3ca
Server: ad89cc1ef9a76f7e5bcccf5162b1f1ffcc473577

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: f4323c4
Pull Request: 313e3ca
Server: dffee4f737b773152b3949b7dcd4d8633bb07dbc

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 7fb9b11
Pull Request: 313e3ca
Server: 2a3d4023b7c58a47d65da1ee80d81a8601610c9a

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 7fb9b11
Pull Request: 313e3ca
Server: c1918228eea4a9538191e7f1a559f1311f10ed51

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 111fcba
Pull Request: 313e3ca
Server: 4153a553163d0de4035d9224a73f42a3f010df42

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 14e46b4
Pull Request: 313e3ca
Server: 5f4dec2f9c3f91143c0ad5c5492b438a61f8a18f

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: a3cdbf3
Pull Request: 313e3ca
Server: f2133718cfcd9bbfb2994a4a7fcaf91fc61d41d5

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 95b9445
Pull Request: 313e3ca
Server: 97a190edf6c7bb58b2acbeeda5bf6698de020465

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 20011e7
Pull Request: 313e3ca
Server: 2e731073e36a032409393e7b066575fc562c950d

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2ae52fb
Pull Request: 313e3ca
Server: 16a95122177cfe8eac248247da187b8b4ac98425

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 6beb065
Pull Request: 313e3ca
Server: 80dfd4321ea8d4015ca08ae4c7f8ab0edd6850bb

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 1f58235
Pull Request: 313e3ca
Server: 47dce9a830dff71fb274f8911596f4c19fe5b522

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: bf136fc
Pull Request: 313e3ca
Server: 7b502afb32946ac6c383f2928f675beefbded229

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: bf136fc
Pull Request: ad7c018
Server: f9bca01da2c42730ab29b27e607d3b85fcc4e9b7

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 40eeade
Pull Request: 5d35347
Server: a4645b8017d820c7565aebebdb717cacd998fd19

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 40eeade
Pull Request: 5d35347
Server: 23afa6135378ef149b00ee036f12cab470f74e38

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 40eeade
Pull Request: 5d35347
Server: fb72117df88794e73a7f48dac7d91f9f9fa9ab4c

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: cfbd546
Pull Request: 5d35347
Server: 9603574f00999d39f0ae95306706bfe1447f5b4e

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: cfbd546
Pull Request: 5d35347
Server: 0632f43882f429fff89f23dafe1081ea3bb92f50

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 9c816ad
Pull Request: 5d35347
Server: a48e5589cd985db0f29dd1cd99527f96859c1bff

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2c79561
Pull Request: 5d35347
Server: 78b21e70eb9d66969ad7fd2e784ec233035cb9d2

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2c79561
Pull Request: 5d35347
Server: bf64187d2ee27a2d5f939833b1306e8eb555f9c7

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2c79561
Pull Request: 5d35347
Server: ae33c730485b77e9bec66e606960ef4c7f7f03ac

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: dbd4505
Pull Request: 5d35347
Server: fb6b7837b645851d72de5d76c154c5408f6670aa

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2d84a4d
Pull Request: 5d35347
Server: 2a4fdd4ac62aa8328f8d017bc1e44f9b8aaa65b9

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 88380bb
Pull Request: 5d35347
Server: 453cc9cbed579dda8d1802bf37ad4c62edd69a16

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 85cc6cf
Pull Request: 5d35347
Server: 85a57aac90edc6d20c078f702c448229d6071821

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 839379c
Pull Request: 5d35347
Server: acca6b22ad993e6319597feb728ab37089d87bab

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 839379c
Pull Request: 5d35347
Server: ed472578dc558dacfeb8a78687aa96b1180a073a

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 839379c
Pull Request: 68ff25e
Server: f07caa04faee37cd9adb9d3d16b59340248ad693

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 094bfdd
Pull Request: 68ff25e
Server: 8a8e087589c72084db0c94fb1b40e75b0d3d6ce6

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 094bfdd
Pull Request: 68ff25e
Server: b06b4e3220fad34ad681268f5b6e8a7d47428b70

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: acdaea9
Pull Request: 68ff25e
Server: 37eabb0dfd1075d98dfba34546b91f672592a089

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 3a44ff3
Pull Request: 68ff25e
Server: 07ae15df0acf6b71544f70d37d01fc54c95d4c03

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 3a44ff3
Pull Request: 68ff25e
Server: 1a09d98a297ffc0225e804d86ba5e315a8be2c2d

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 652a380
Pull Request: 68ff25e
Server: 9dd357f921ae2e496c647934e69ea03ecad4e880

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 82b55c5
Pull Request: 68ff25e
Server: f71ef5a703deba0709ec9aa055535b50c133ee10

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: eca3713
Pull Request: 68ff25e
Server: d242182e778e4f6e287985e250c9ea3c8fddaf57

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 1b15b0f
Pull Request: 68ff25e
Server: f9ab89b3c045577a86a06b98ea324f5036541ff0

Comment

@MosleyTheMalO MosleyTheMalO merged commit 46d4630 into SPLURT-Station:master Jun 4, 2024
6 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 4, 2024
@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 6ca987e
Pull Request: 68ff25e
Server: 39dfe07a2981eabe6ce008a2459240c0e29a4a4a

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants