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

ab7ca1af

Commit ab7ca1af authored 2 years ago by Pregmodder

Downloads
- Plain Diff

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

Rework SE Asshole Knight to respect seeDicks, and a few little fixes

Closes #4265 and #4266

See merge request !11055

parents eac0decd 5e7a410e

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

js/medicine/surgery/exotic/treatment.js 1 addition, 1 deletion

js/medicine/surgery/exotic/treatment.js
src/endWeek/player/prDiet.js 1 addition, 1 deletion

src/endWeek/player/prDiet.js
src/events/scheduled/assholeKnight.js 37 additions, 28 deletions

src/events/scheduled/assholeKnight.js
src/gui/Encyclopedia/encyclopediaBeingInCharge.js 3 additions, 3 deletions

src/gui/Encyclopedia/encyclopediaBeingInCharge.js
src/npc/generate/newSlaveIntro.js 2 additions, 2 deletions

src/npc/generate/newSlaveIntro.js

with 44 additions and 35 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