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

cbf9cf1e

Commit cbf9cf1e authored 3 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'SecExp-backport-assorted' into 'pregmod-master'

Sec exp backport assorted

See merge request !9711

parents c857c9a0 a8f39307

No related branches found

No related tags found

1 merge request!9711Sec exp backport assorted

Pipeline #40431 passed 3 years ago

Stage: build

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/Mods/SecExp/buildings/secBarracks.tw 5 additions, 5 deletions

src/Mods/SecExp/buildings/secBarracks.tw
src/Mods/SecExp/events/attackOptions.js 20 additions, 30 deletions

src/Mods/SecExp/events/attackOptions.js
src/Mods/SecExp/js/Unit.js 237 additions, 299 deletions

src/Mods/SecExp/js/Unit.js
src/Mods/SecExp/js/reportingRelatedFunctions.js 14 additions, 14 deletions

src/Mods/SecExp/js/reportingRelatedFunctions.js
src/Mods/SecExp/js/secExpBC.js 30 additions, 7 deletions

src/Mods/SecExp/js/secExpBC.js
src/Mods/SecExp/js/securityReport.js 2 additions, 4 deletions

src/Mods/SecExp/js/securityReport.js
src/gui/options/options.js 1 addition, 4 deletions

src/gui/options/options.js
src/uncategorized/manageArcology.tw 1 addition, 1 deletion

src/uncategorized/manageArcology.tw

with 310 additions and 364 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