Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b02fe1d2

Commit b02fe1d2 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

murderAttempt round 2

See merge request pregmodfan/fc-pregmod!7652

parents 4c7e0143 cd97e4c7

Branches

Tags

Loading

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/events/scheduled/maMilitaryDeal.tw 0 additions, 3 deletions

src/events/scheduled/maMilitaryDeal.tw
src/events/scheduled/maSlaveTrade.tw 0 additions, 3 deletions

src/events/scheduled/maSlaveTrade.tw
src/events/scheduled/maTradeDeal.tw 0 additions, 3 deletions

src/events/scheduled/maTradeDeal.tw
src/events/scheduled/murderAttempt.js 101 additions, 103 deletions

src/events/scheduled/murderAttempt.js
src/events/scheduled/murderAttempt.tw 9 additions, 1 deletion

src/events/scheduled/murderAttempt.tw
src/uncategorized/arcmgmt.tw 1 addition, 1 deletion

src/uncategorized/arcmgmt.tw
src/uncategorized/nonRandomEvent.tw 6 additions, 3 deletions

src/uncategorized/nonRandomEvent.tw

with 117 additions and 117 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