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

ae2cf21a

Commit ae2cf21a authored 8 months ago by Pregmodder

Downloads
- Plain Diff

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

MB daughters path + tweak milk bloating

Closes #5270

See merge request pregmodfan/fc-pregmod!12054

parents 86cba5e3 79a65cd2

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/nextWeek/nextWeek.js 4 additions, 2 deletions

src/endWeek/nextWeek/nextWeek.js
src/events/nonRandom/daughters/pCollaborationChoice.js 7 additions, 3 deletions

src/events/nonRandom/daughters/pCollaborationChoice.js
src/events/nonRandom/daughters/pTraitorMessage.js 10 additions, 1 deletion

src/events/nonRandom/daughters/pTraitorMessage.js
src/events/nonRandom/daughters/pUndergroundRailroad.js 32 additions, 0 deletions

src/events/nonRandom/daughters/pUndergroundRailroad.js
src/npc/descriptions/boobs/boobs.js 2 additions, 2 deletions

src/npc/descriptions/boobs/boobs.js

with 55 additions and 8 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