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

00d1e1f5

Commit 00d1e1f5 authored 2 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fix' into 'pregmod-master'

Fixes and Additions

Closes #4271, #4223, #4285, and #4283

See merge request !11077

parents 9e3866ff b0ca58dc

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/gameVariableData.js 1 addition, 0 deletions

js/003-data/gameVariableData.js
js/medicine/surgery/structural/amputation.js 7 additions, 2 deletions

js/medicine/surgery/structural/amputation.js
js/medicine/surgery/voice/mute.js 7 additions, 2 deletions

js/medicine/surgery/voice/mute.js
src/gui/options/options.js 3 additions, 0 deletions

src/gui/options/options.js
src/js/DefaultRules.js 5 additions, 5 deletions

src/js/DefaultRules.js
src/js/rulesAssistant.js 1 addition, 1 deletion

src/js/rulesAssistant.js
src/js/rulesAssistantOptions.js 16 additions, 2 deletions

src/js/rulesAssistantOptions.js

with 40 additions and 12 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