308 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
SandPoot 054716857f push 2025-03-10 16:11:56 -03:00
Darius 28e7b99472 Modularize Sheltered edit
Modularizes the edits to Sandstorm's quirk Sheltered
2024-11-04 14:48:01 -05:00
Mosley bd1993e2a8 Merge remote-tracking branch 'upstream/master' 2024-09-07 15:56:35 -05:00
SandPoot 909acfb468 push some fixes 2024-09-05 22:47:46 -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 fe903dafce Merge remote-tracking branch 'upstream/master' 2024-07-21 20:59:59 -05:00
SandPoot 32dd8e2495 2024-07-19 20:04:30 -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
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza fc2f85d526 Rewrite and improve breast-size-related code 2024-04-01 11:33:31 -04:00
BongaTheProto 493fa7f215 Merge branch 'master' into upstream-merge 2024-03-28 15:43:55 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03: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
BongaTheProtoandGitHub 0fe4746c75 Merge pull request #1034 from ariaworld/morpher-potency
[SMALL SEMI-MODULAR] Body morpher additions and Sexual Potency tweak.
2023-12-24 21:41:48 -05:00
BongaTheProto d237bf19f8 Update interaction_menu_granter.dm 2023-12-21 17:15:09 -05: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 d71ae369d6 reorganizes flags to be alphabetical 2023-12-11 15:23:53 -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