638 Commits
Author SHA1 Message Date
Mosley 24c0a1314f some fixes
I have no idea if these works, this just allows the server to compile
2025-04-24 17:18:02 -05:00
Ayy-RoboticsandGitHub 0a82d5f54a Adds Shuttle Code 2025-01-23 15:42:38 -05:00
Darius bf28d3bcff Move Sanguine Metabolism
Moves Sanguine Metabolism to a separate file to match new formatting.
2024-11-09 20:53:27 -05:00
Darius 073c86d3c8 Fix missing trailing newlines
Adds missing trailing newlines to two quirk files.
2024-11-05 08:30:45 -05:00
Darius 685221b840 Remove invalid quirk
Removes a mistakenly added reference to a new-codebase quirk.
2024-11-04 15:05:49 -05:00
Darius 28e7b99472 Modularize Sheltered edit
Modularizes the edits to Sandstorm's quirk Sheltered
2024-11-04 14:48:01 -05:00
Darius e70aeea39b Quirk file separations
This does the following:
- Separates all modular quirks into separate files, with no other changes.
- Modularizes some non-modular edits into a new file
- Fixes location of hydra trait definition
2024-11-04 13:49:08 -05:00
Mosley 6f5b714487 fein fein fein fein fein
I better get a dommy mommy for this
2024-11-03 12:40:03 -05:00
Mosley cd03ca1151 Merge branch 'master' into content-stuff 2024-10-24 15:21:03 -05:00
Mosley 14380b60a5 Merge remote-tracking branch 'venus/master' into content-stuff 2024-10-07 17:12:36 -05:00
SaraandGitHub e18e61dda8 Merge branch 'SPLURT-Station:master' into 4nal 2024-10-06 12:32:18 -06:00
Sim 8825218293 initial commit 2024-09-27 16:13:51 -03:00
Mosley 2cbf7b22e6 Revert "GOKU VS UNHOLY CODE."
This reverts commit 9c31d41bcc.
2024-09-20 02:04:20 -05:00
Mosley 3a8024db6d undoes removals 2024-09-20 01:13:14 -05:00
ariaworld 6a6ffac524 Let's go GAMBLING!! 2024-09-15 16:53:17 +02:00
ariaworld 9c31d41bcc GOKU VS UNHOLY CODE. 2024-09-12 04:17:32 +02:00
SaraandGitHub 6fd36ddc0a Merge branch 'SPLURT-Station:master' into 4nal 2024-09-10 21:03:06 -06:00
ariaworld e0b2d50710 Merge remote-tracking branch 'splurt/master' 2024-09-08 01:20:49 +02:00
Mosley dd7eba9d94 followup 2024-09-07 15:56:45 -05:00
xhianil f469776770 Initial finish
My first 'finished' pass on the new map.
2024-08-08 13:37:17 -06:00
ariaworld 29a9c5e88c Merge remote-tracking branch 'splurt/master' 2024-08-05 20:48:20 +02:00
ariaworld d2422de379 Removes N.2 unholy ERP verbs. Add: new textures for doors and floors. 2024-08-05 20:46:52 +02:00
Fabian SandGitHub 01b804d6ac Fix thighjobs
Literally just swaps around the defines because they were copypasted from thighfucking.
2024-06-23 01:25:39 +02:00
El Derp o Derp 6adb16a78a Allow users to change glow intensity. 2024-06-05 02:10:07 -07:00
BongaTheProto 68ff25e205 Merge branch 'master' into pr/784 2024-05-14 19:23:36 -05:00
Elizabeth Lavenza 2594f31762 Fix cooldown abilities never running 2024-04-13 20:03:55 -04: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 3c249d48aa Fix invalid proc refs in modular SPLURT code 2024-04-06 20:59:59 -04:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza 6d580ba44f Limit genitals menu to carbontype mobs 2024-04-01 15:43:14 -04:00
Elizabeth Lavenza 0911076eb3 Fix cosmetic glow quirk runtime 2024-04-01 11:33:30 -04:00
BongaTheProto 493fa7f215 Merge branch 'master' into upstream-merge 2024-03-28 15:43:55 -05:00
BongaTheProtoandGitHub 247da97948 Merge pull request #1121 from ariaworld/fix-somethings
[HOLY] Actually gets rid of miscarriage code, forever.
2024-03-28 15:03:33 -05:00
BongaTheProtoandGitHub 9d9faaee24 Merge pull request #1101 from ariaworld/kiss-slut
[BOUNTY] Adds the kiss slut trait + fixes oral sex verbs
2024-03-24 17:56:58 -05:00
ariaworld cc16df1354 Get rid of miscarriage code, forever. 2024-03-24 14:37:24 +01:00
BongaTheProto 1883c47d5c basic ref regex
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05:00
ariaworld c6fb8682a6 Modularize kiss slut 2024-03-12 00:40:05 +01:00
AzarakandGitHub c17eef2cec Merge branch 'master' into jank 2024-03-09 22:35:42 +01:00
sebdazandsebdaz 0ee543ae44 Merge remote-tracking branch 'upstream/master' into jank 2024-03-09 22:23:06 +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
ariaworld 9570c9bec9 Refactor, clean and optimize tailbag code. 2024-03-01 22:52:13 +01:00
ariaworldandGitHub e155e394c3 Merge branch 'SPLURT-Station:master' into tweak-undead 2024-02-10 21:56:42 +01:00
ariaworld 80711d8bd9 Better wording 2024-01-27 17:37:36 +01:00
Vhariik c088fa53f4 Update pregnancy.dm 2024-01-26 21:15:38 -03:00
ariaworld 88328acd56 Balance time! 2024-01-26 22:16:57 +01:00
ariaworld 85ebb8cfdd Tweak healing factor 2024-01-24 23:33:53 +01:00
ariaworldandGitHub 50efed9f71 Increase healing factor cost! 2024-01-24 11:01:11 +01:00
ariaworld 2706929069 Merge remote-tracking branch 'upstream/master' into tweak-undead 2024-01-18 11:12:04 +01:00
ariaworld fde8d80de6 Merge remote-tracking branch 'upstream/master' into december-qol 2024-01-02 21:16:39 +01:00