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

547b3f85

Commit 547b3f85 authored 2 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fix' into 'pregmod-master'

Fixes

Closes #4479, #4472, and #4460

See merge request !11271

parents b9d824c4 58f6c626

No related branches found

No related tags found

1 merge request!11271Fixes

Pipeline #56951 passed 2 years ago

Stage: build

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

css/interaction/prosthetics.css 2 additions, 2 deletions

css/interaction/prosthetics.css
js/random.js 7 additions, 7 deletions

js/random.js
src/events/RESS/review/birthdaySex.js 6 additions, 2 deletions

src/events/RESS/review/birthdaySex.js
src/npc/descriptions/limbs.js 43 additions, 26 deletions

src/npc/descriptions/limbs.js
src/npc/generate/generateMarketSlave.js 13 additions, 2 deletions

src/npc/generate/generateMarketSlave.js
src/npc/surgery/cloningWorkaround.js 12 additions, 9 deletions

src/npc/surgery/cloningWorkaround.js
src/npc/surgery/ovaTransplantWorkaround.js 12 additions, 5 deletions

src/npc/surgery/ovaTransplantWorkaround.js

with 95 additions and 53 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