Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

19ec6410

Commit 19ec6410 authored 1 year ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

Fixes

Closes #4975 and #4978

See merge request !11656

parents bd8e04a7 db12c425

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/art/genAI/skinPromptPart.js 1 addition, 1 deletion

src/art/genAI/skinPromptPart.js
src/facilities/brothel/brothelAssignmentScene.js 2 additions, 2 deletions

src/facilities/brothel/brothelAssignmentScene.js
src/interaction/siWardrobe.js 1 addition, 1 deletion

src/interaction/siWardrobe.js
src/npc/generate/newSlaveIntro.js 2 additions, 2 deletions

src/npc/generate/newSlaveIntro.js

with 6 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment