197 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 620b4dfea7 push 2025-04-21 04:17:50 -03:00
ElectoriaLegend cff6cd6f09 Better frotting 2025-04-18 16:36:19 -03:00
SandPoot e17d8fd74c push 2025-04-18 15:43:30 -03:00
Mosley e08a8979ce Merge remote-tracking branch 'upstream/master' 2024-08-10 16:23:11 -05:00
SandPootandGitHub 509ba6e4d9 Merge pull request #381 from xTheLifex/master
Arousal Multiplier & More
2024-08-09 20:20:02 -03:00
SandPoot 2a9182dfdf push 2024-08-09 20:13:26 -03:00
Mosley d6d399a893 Merge remote-tracking branch 'upstream/master' 2024-08-09 16:00:04 -05:00
xTheLifex bea79a1030 Overengineering 2024-08-08 15:04:18 -03:00
SandPoot e6cac6e7f8 push, not final yet 2024-08-05 12:02:49 -03:00
SandPoot ea9c4f0461 push 2024-08-04 02:42:57 -03:00
xTheLifex a39f70769b Preferences Moment 2024-08-03 21:35:48 -03:00
xTheLifex f0ae4da8f4 Mob var version 2024-08-03 20:21:22 -03:00
xTheLifex 2ba3fbabb0 Sex Update 2024-08-02 19:56:59 -03:00
SandPoot 54252b55d5 push 2024-07-31 01:13:15 -03:00
BongaTheProto 7d0d1b32d6 Merge remote-tracking branch 'upstream/master' 2024-07-25 16:39:46 -05:00
SandPoot 8c85d0d630 push 2024-07-24 15:27:51 -03:00
BongaTheProto 68ff25e205 Merge branch 'master' into pr/784 2024-05-14 19:23:36 -05:00
BongaTheProtoandGitHub 78d4eaeaaa Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
Fix harddel issues with 515 upgrade PR
2024-04-07 03:16:55 -05:00
Elizabeth Lavenza 7b93e3e58a Fix bad proc refs in modular Sandstorm code 2024-04-06 20:58:44 -04:00
Elizabeth Lavenza fc2f85d526 Rewrite and improve breast-size-related code 2024-04-01 11:33:31 -04:00
ariaworld c6fb8682a6 Modularize kiss slut 2024-03-12 00:40:05 +01:00
AzarakandGitHub 5d35347b47 Update lewd_definitions.dm 2024-03-09 22:39:59 +01:00
AzarakandGitHub c17eef2cec Merge branch 'master' into jank 2024-03-09 22:35:42 +01:00
sebdaz 0c2ccf6a5e Revert "Potency climax limit bypass (#1)"
This reverts commit ea1622aa86.
2024-03-09 22:13:54 +01:00
ariaworld 79a9c482a3 Add: kiss slut trait + fix oral sex verbs 2024-03-06 13:58:35 +01:00
ariaworldandGitHub bca242cfbf Merge branch 'SPLURT-Station:master' into morpher-potency 2023-12-20 19:36:00 +01:00
ariaworld f0c288c5c2 Potency + Body morpher 2023-12-20 19:33:47 +01:00
BongaTheProto 2a4ac19482 followup
and fix hopefully
2023-12-18 22:38:30 -05:00
BongaTheProto bc5a87cdb2 Merge remote-tracking branch 'upstream/master' 2023-12-18 21:22:28 -05:00
SandPoot 01dbd7deab no 2023-12-16 17:28:13 -03:00
SandPoot cf30d74867 push 2023-12-16 17:20:55 -03:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot aeabd21ed5 push 2023-12-12 22:00:26 -03:00
SandPoot 2428e642bf all of those already inherit from /datum/interaction, unless they're anywhere not 1, i won't allow 2023-12-09 21:18:40 -03:00
SandPoot bfc964b76b do you know the definition of insanity 2023-12-09 20:27:19 -03:00
ariaworldandGitHub ea1622aa86 Potency climax limit bypass (#1)
* Potency climax limit bypass

* Fix comment spacing
2023-11-27 22:41:16 +01:00
BongaTheProto 73700f9417 Merge branch 'master' into pr/784 2023-11-06 15:48:57 -05:00
ariaworld d8a726e4dd Lewd verbs spelling. (Note some verbs are without periods because they default to it) 2023-10-23 22:32:45 +02:00
ariaworld cf406724d6 Climax positive mood lasts more, less sex verb cooldown. 2023-10-23 22:28:01 +02:00
BongaTheProto 7b5ecc7b49 Merge remote-tracking branch 'upstream/master' 2023-10-07 23:28:42 -05:00
SandPootandМарк bcbecabf74 push
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
2023-10-06 01:11:28 -03:00
BongaTheProto cd026aaddb Merge remote-tracking branch 'upstream/master' 2023-10-05 13:38:12 -05:00
SandPoot b7af940a28 fix lack of message for special cases 2023-10-04 13:35:50 -03:00
AzarakandGitHub f138d74bac Merge branch 'master' into jank 2023-09-24 13:13:57 +02:00
BongaTheProto d9a628e027 followup 2023-09-23 18:31:45 -05:00
BongaTheProto f405132915 Merge remote-tracking branch 'upstream/master' 2023-09-23 18:15:45 -05:00
SandPoot eba26a5775 push 2023-09-23 19:16:12 -03:00
AzarakandGitHub 78183fc85b Remove redundancy 2023-09-07 15:01:22 +02:00
Azarak 2f18939bc0 Merge remote-tracking branch 'upstream/master' into jank 2023-09-05 14:23:42 +02:00