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.

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

[MIRROR] Makes the spelling of 'mjollnir' consistant and renames singularityhammer.dm to wizard_weapons.dm 2 #627

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25006
Original PR: tgstation/tgstation#79700

About The Pull Request

All the below copied from #79588

Does as the tin says and renames all instances of 'mjolnir' to 'mjollnir' . They are TECHNICALLY both correct but because 'mjolnir' was only used for the spelling in game for the hammer itself and the icon when worn on the back I decided on two l's. This also means I had to change the icon name for the back sprite

If I'm missing any files with it spelt 'mjolnir' please tell me

While I was at it i also decided to change singularityhammer.dm to wizard_weapons.dm because apparently the file is supposed to be where wizard weapon are stored and having it be named after a single weapon is confusing incase people add more weapons later on.

Why It's Good For The Game

More consistent spelling.

Code wise it makes it more clear what the intended use for a file is

Changelog

🆑 D4C-420
spellcheck: hopefully changed all instances of the word 'mjolnir' to 'mjollnir'
/:cl:

…ularityhammer.dm to wizard_weapons.dm 2 [MDB IGNORE] (#25006)

* Makes the spelling of 'mjollnir' consistant and renames singularityhammer.dm to wizard_weapons.dm 2 (#79700)

## About The Pull Request

All the below copied from #79588

Does as the tin says and renames all instances of 'mjolnir' to
'mjollnir' . They are TECHNICALLY both correct but because 'mjolnir' was
only used for the spelling in game for the hammer itself and the icon
when worn on the back I decided on two l's. This also means I had to
change the icon name for the back sprite

If I'm missing any files with it spelt 'mjolnir' please tell me

While I was at it i also decided to change singularityhammer.dm to
wizard_weapons.dm because apparently the file is supposed to be where
wizard weapon are stored and having it be named after a single weapon is
confusing incase people add more weapons later on.

## Why It's Good For The Game
More consistent spelling.

Code wise it makes it more clear what the intended use for a file is

## Changelog
:cl:
spellcheck: hopefully changed all instances of the word 'mjolnir' to
'mjollnir'
/:cl:

* Makes the spelling of 'mjollnir' consistant and renames singularityhammer.dm to wizard_weapons.dm 2

---------

Co-authored-by: D4C-420 <[email protected]>
@Iajret Iajret merged commit d369ca9 into master Nov 15, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25006 branch November 15, 2023 09:13
AnywayFarus added a commit that referenced this pull request Nov 15, 2023
Iajret pushed a commit that referenced this pull request Jan 26, 2024
…pumps) to just make the flatpack item form of the thing instead (#627)

i love upstream! I love corn syrup!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants