Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Science to Epistemics #47

Merged
merged 17 commits into from
Sep 28, 2023
Merged

Science to Epistemics #47

merged 17 commits into from
Sep 28, 2023

Commits on Sep 27, 2023

  1. RD to Mystagogue

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    ce556f4 View commit details
    Browse the repository at this point in the history

  2. Science to Epistemics

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    07e9930 View commit details
    Browse the repository at this point in the history

  3. fix

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    a39e69b View commit details
    Browse the repository at this point in the history

  4. Delete steal-research-condition.ftl

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    b0ac205 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into episcientemics

    @FluffiestFloof
    FluffiestFloof authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    48fbd7d View commit details
    Browse the repository at this point in the history

  6. Remove duplicate headset 

    Those were simply renamed in the base files
    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    01f62ea View commit details
    Browse the repository at this point in the history

  7. coats and mysta hat

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    3e7c0f5 View commit details
    Browse the repository at this point in the history

  8. additional comments

    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    c52b7b4 View commit details
    Browse the repository at this point in the history

  9. epi sign 

    replaces science sign
    @FluffiestFloof
    FluffiestFloof committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    902ab2e View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Merge branch 'master' into episcientemics

    @FluffiestFloof
    FluffiestFloof authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    081c518 View commit details
    Browse the repository at this point in the history

  2. Chaplain

    @FluffiestFloof
    FluffiestFloof committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    48713b2 View commit details
    Browse the repository at this point in the history

  3. Give chaplain science headset

    @FluffiestFloof
    FluffiestFloof committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    4f763e5 View commit details
    Browse the repository at this point in the history

  4. mystagogue's turban

    @FluffiestFloof
    FluffiestFloof committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    c7a1842 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into episcientemics 

    Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
    @FluffiestFloof
    FluffiestFloof authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    cdbde3b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into episcientemics 

    Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
    @FluffiestFloof
    FluffiestFloof authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    9889ed1 View commit details
    Browse the repository at this point in the history

  7. Forgot about the dead chaplain spawner

    @FluffiestFloof
    FluffiestFloof committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    af5198c View commit details
    Browse the repository at this point in the history

  8. Update Traitors.xml 

    Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
    @Colin-Tel
    Colin-Tel authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    ae2a7cb View commit details
    Browse the repository at this point in the history