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

fe3d6e49

Commit fe3d6e49 authored 2 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents 72b306c5 e06d18b3

No related branches found

No related tags found

1 merge request!11148Add sort by beauty

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

js/utils.js 1 addition, 19 deletions

js/utils.js
src/art/webgl/ui.js 1 addition, 1 deletion

src/art/webgl/ui.js
src/descriptions/familySummaries.js 14 additions, 14 deletions

src/descriptions/familySummaries.js
src/descriptions/officeDescription.js 36 additions, 24 deletions

src/descriptions/officeDescription.js
src/endWeek/player/prMobility.js 1 addition, 1 deletion

src/endWeek/player/prMobility.js
src/events/intro/arcologySelection.js 3 additions, 0 deletions

src/events/intro/arcologySelection.js
src/events/intro/introSummary.js 2 additions, 4 deletions

src/events/intro/introSummary.js
src/events/nonRandom/pInvasion.js 20 additions, 39 deletions

src/events/nonRandom/pInvasion.js
src/events/scheduled/seNicaeaCouncil.js 1 addition, 0 deletions

src/events/scheduled/seNicaeaCouncil.js
src/js/utilsPC.js 6 additions, 5 deletions

src/js/utilsPC.js
src/npc/descriptions/sceneIntro.js 47 additions, 48 deletions

src/npc/descriptions/sceneIntro.js
src/npc/interaction/killSlave.js 6 additions, 59 deletions

src/npc/interaction/killSlave.js
src/player/desc/pLongBoobs.js 1 addition, 1 deletion

src/player/desc/pLongBoobs.js

with 139 additions and 215 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