Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Karryns Prison CCMod
- Activity
- Members
- Labels
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0fa6c64f

Commit 0fa6c64f authored 4 years ago by localuser

Downloads
- Plain Diff

Merge branch 'dev-local' into dev

parents ff8c2b51 194c98de

No related branches found

Tags 0.7A.k

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 0 deletions

README.md
ccmod_resources/CCMOD_README.txt 2 additions, 0 deletions

ccmod_resources/CCMOD_README.txt
ccmod_resources/www/data/Skills.json 6 additions, 6 deletions

ccmod_resources/www/data/Skills.json
ccmod_resources/www/data/System.json 1 addition, 1 deletion

ccmod_resources/www/data/System.json
data/Armors.json 4 additions, 4 deletions

data/Armors.json
data/RemLines.json 2 additions, 2 deletions

data/RemLines.json
data/Skills.json 6 additions, 6 deletions

data/Skills.json
data/System.json 1 addition, 1 deletion

data/System.json
js/plugins/RemtairyCombat.js 1 addition, 1 deletion

js/plugins/RemtairyCombat.js
js/plugins/RemtairyKarrynOnani.js 1 addition, 0 deletions

js/plugins/RemtairyKarrynOnani.js
js/plugins/RemtairyTextManager.js 1 addition, 1 deletion

js/plugins/RemtairyTextManager.js

with 27 additions and 22 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