Making Glock accept silencer and autolathe emaggable to build silencers#968
Open
Limeliz wants to merge 6 commits intoNTStation:masterfrom
Open
Making Glock accept silencer and autolathe emaggable to build silencers#968Limeliz wants to merge 6 commits intoNTStation:masterfrom
Limeliz wants to merge 6 commits intoNTStation:masterfrom
Conversation
Made autolathe emaggable. Added silencer to autolathe (available for 200k metal when emagged).
Silencer now fits on the Glock. Silencer costs 200k metal to produce from an emagged Autolathe.
Forgot to remove some commented out code that was never needed.
New sprites for Glock, including two with silencer attached.
code/game/machinery/autolathe.dm
Outdated
Contributor
There was a problem hiding this comment.
Add a span class please. Preferably 'warning' but 'notice' works.
Contributor
|
Also, you have an error. You change the type path for the glock but didn't change it every time it is used in the code. In dream maker use Ctrl + F to search for the old type path(s) and change them to the new type path. You could use Find and Replace but there shouldn't be more than one or two type paths to correct. Otherwise this PR is great. |
Added silencer to be summoned together with the Glock during Summon Weapons. Updated Glock typepath.
Contributor
Author
Contributor
Author
|
This is finished and is ready to be merged. |
|
I know I'm kinda late to the party... but I still like this PR and wanna see it get merged... It deserves it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Made the silencer fit on the Glock (Glock has new typepath).
Made the Autolathe emaggable.
Emagged Autolathe can now build silencers (costs 200k metal, which means the Autolathe needs to be upgraded some).
New sprites for Glock so it can fit the silencer:
Fixes #855