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

Admin message

GitGud GitLab Security Patching
GitGud will be applying critical security patches at 11 PM Eastern Time tonight. Estimated Downtime is 20mins. Check the Sapphire Status Page or our Discord for uptime updates if it exceeds the maintenance window.

e1388777

Commit e1388777 authored 1 year ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #4781

See merge request !11505

parents 1459f3b9 4308f5bf

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/slaveMods.js 6 additions, 0 deletions

js/003-data/slaveMods.js
src/gui/Encyclopedia/encyclopediaFutureSocities.js 0 additions, 1 deletion

src/gui/Encyclopedia/encyclopediaFutureSocities.js
src/interaction/universalRules.js 3 additions, 0 deletions

src/interaction/universalRules.js
src/npc/generate/slaveGenerationJS.js 9 additions, 0 deletions

src/npc/generate/slaveGenerationJS.js

with 18 additions and 1 deletion

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