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

51b5c8e3

Commit 51b5c8e3 authored 3 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'speech' into 'pregmod-master'

Ennunciation work; remove ${s} system

See merge request pregmodfan/fc-pregmod!10097

parents 9fb88224 95b2c35c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/Mods/Catmod/events/CMRESS/annoyingcat.js 10 additions, 4 deletions

src/Mods/Catmod/events/CMRESS/annoyingcat.js
src/Mods/Catmod/events/CMRESS/catPresent.js 150 additions, 19 deletions

src/Mods/Catmod/events/CMRESS/catPresent.js
src/Mods/Catmod/events/CMRESS/lazyCat.js 14 additions, 2 deletions

src/Mods/Catmod/events/CMRESS/lazyCat.js
src/events/RESS/frighteningDick.js 6 additions, 2 deletions

src/events/RESS/frighteningDick.js
src/events/RESS/lazyEvening.js 9 additions, 3 deletions

src/events/RESS/lazyEvening.js
src/js/utilsSlave.js 3 additions, 3 deletions

src/js/utilsSlave.js

with 192 additions and 33 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