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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaces Emergency Oxygen Kit in bag with Repair Kit for machines #10299

Closed
wants to merge 6 commits into from
Closed

Conversation

AlAtEX
Copy link
Contributor

@AlAtEX AlAtEX commented Nov 21, 2018

What does this PR do:
Adds 3 new types of boxes, with a emergency welder, 10 pieces of cable, and 100u of oil in an oil can and art for each, based off of shazbot194's box art added in #10177
A civilian box, engineering box (same but with different colour strips), and a mining box (same but with a red crowbar inside and different colour strips)

I have also re-enabled the survival_mining box which has a larger airtank than the default one and a red crowbar in it (if you get stuck outside) that change is located in the jobs/support.dm (if unwanted)

(Realized after I started working that I hadn't cloned my fork, but the master, so had to directly upload files to my fork, sorry if the compare tool freaks out.)

Images of sprite/map changes (IF APPLICABLE):
(Igmur was down for me so I guess just check the .dmi file, Sorry.)

Changelog:
馃啈 AlAtEx
add: Added a repair kit box to start with for IPC's
add: Re-added the crowbar and extended tank to miner's boxes
imageadd: added three new box images
/:cl:

@variableundefined variableundefined added the Feature This PR is a new addition to the game label Nov 21, 2018
@variableundefined
Copy link
Contributor

..Erm.

Did you follow proper instructions? There's way more changes than needed.

You should've made a fork of the master repository, made a clone of it locally, make a feature branch, do the changes, commit, and then push it and make a pull request.

Never, ever make changes directly on your master branch.

Rectify this.

@AlAtEX AlAtEX closed this Nov 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR is a new addition to the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants