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

more fluff, removes kevlar mentions and replaces with venlar #188

Merged
merged 8 commits into from
Apr 10, 2024
Merged

more fluff, removes kevlar mentions and replaces with venlar #188

merged 8 commits into from
Apr 10, 2024

Conversation

KoishiVibe
Copy link
Contributor

Summary

  • most lore is reworked and a few really old mentions of jumpsuit are removed.
  • kevlar replaced with venlar
  • AVPwiki is wrong about the M10, we never actually find out how its made from the TMan.
  • a couple of frankly fluffbased statistical changes

FslashN
FslashN previously requested changes Mar 27, 2024
View reviewed changes
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
@FslashN
Copy link
Contributor

FslashN commented Apr 1, 2024

I'll look into this again soon.

morrowwolf
morrowwolf requested changes Apr 1, 2024
View reviewed changes
Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for a lore nerd to look over this real fast. Feel free to ignore if it takes longer than a week.

@morrowwolf morrowwolf marked this pull request as draft April 1, 2024 17:05
morrowwolf
morrowwolf previously approved these changes Apr 10, 2024
View reviewed changes
@morrowwolf morrowwolf marked this pull request as ready for review April 10, 2024 01:35
@morrowwolf morrowwolf enabled auto-merge (squash) April 10, 2024 01:39
@morrowwolf morrowwolf merged commit 72a1e3f into cmss13-devs:master Apr 10, 2024
34 checks passed
AmoryBlaine added a commit to AmoryBlaine/PvE-CMSS13 that referenced this pull request Apr 10, 2024
@AmoryBlaine
Squashed commit of the following:
96bf547 
commit 6392549
Merge: 5c27cc6 72a1e3f
Author: AmoryBlaine <[email protected]>
Date:   Tue Apr 9 23:38:50 2024 -0400

    Merge branch 'PvE-CMSS13:master' into master

commit 72a1e3f
Author: KoishiVibe <[email protected]>
Date:   Tue Apr 9 21:04:11 2024 -0500

    more fluff, removes kevlar mentions and replaces with venlar (cmss13-devs#188)

    Co-authored-by: KoishiVibe <[email protected]>
    Co-authored-by: morrowwolf <[email protected]>

commit 0c61b76
Author: DexterDude <[email protected]>
Date:   Tue Apr 9 21:24:46 2024 -0400

    M44 sprite and sound changes (cmss13-devs#196)

commit 4475857
Author: morrowwolf <[email protected]>
Date:   Tue Apr 9 21:22:51 2024 -0400

    Medals (cmss13-devs#222)

commit 4020295
Author: grifp71 <[email protected]>
Date:   Tue Apr 9 21:22:20 2024 -0400

    Biblically Accurate Smartguns (cmss13-devs#213)

    Co-authored-by: morrow <[email protected]>

commit 5c27cc6
Merge: 298847c 0976be2
Author: AmoryBlaine <[email protected]>
Date:   Mon Apr 8 17:13:21 2024 -0400

    Merge branch 'PvE-CMSS13:master' into master

commit 0976be2
Author: AndroBetel <[email protected]>
Date:   Mon Apr 8 23:30:12 2024 +0300

    machetes now have belt slot sprites (cmss13-devs#224)

    Fix for a previously invisible belt scabbard.

commit 1a5b544
Author: grifp71 <[email protected]>
Date:   Sun Apr 7 19:15:10 2024 -0400

    Machetes on back for smartgunners (cmss13-devs#177)

commit 784a01f
Author: AmoryBlaine <[email protected]>
Date:   Sat Apr 6 19:00:35 2024 -0400

    Fixes horizontal access denied sprite (cmss13-devs#218)

    Horizontal fix.

commit c91382d
Author: Nihisohel <[email protected]>
Date:   Sun Apr 7 00:03:12 2024 +0800

    Tactical reload on the move (cmss13-devs#217)
@KoishiVibe KoishiVibe deleted the kevlar-must-die branch April 15, 2024 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FslashN FslashN FslashN left review comments

@morrowwolf morrowwolf morrowwolf left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KoishiVibe @FslashN @morrowwolf