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

4cb4d64e

Commit 4cb4d64e authored 3 years ago by Pregmodder

Downloads
- Plain Diff

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

Sell/Discard slave improvements and other fixes

Closes #3109

See merge request pregmodfan/fc-pregmod!9707

parents fe7d80a1 13a6a02c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

js/002-config/fc-js-init.js 1 addition, 0 deletions

js/002-config/fc-js-init.js
src/005-passages/interactPassages.js 16 additions, 0 deletions

src/005-passages/interactPassages.js
src/events/RE/reStandardPunishment.js 1 addition, 1 deletion

src/events/RE/reStandardPunishment.js
src/events/randomEvent.js 2 additions, 1 deletion

src/events/randomEvent.js
src/events/scheduled/seRaiding.js 0 additions, 1 deletion

src/events/scheduled/seRaiding.js
src/interaction/discard.js 39 additions, 0 deletions

src/interaction/discard.js
src/interaction/saleFunctions.js 66 additions, 0 deletions

src/interaction/saleFunctions.js
src/interaction/sellSlave.js 180 additions, 437 deletions

src/interaction/sellSlave.js
src/uncategorized/discardConfirm.tw 0 additions, 7 deletions

src/uncategorized/discardConfirm.tw

with 305 additions and 447 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