forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 68
Adds Lube Drums to Cargo #870
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
Open
dawsonkeyes
wants to merge
10
commits into
DopplerShift13:master
Choose a base branch
from
dawsonkeyes:lubed-up
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+48
−0
Open
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
9b2ffc6
drum
dawsonkeyes 9e3e465
tanks
dawsonkeyes 03450b7
icons
dawsonkeyes 9872db1
cargo supply packs
dawsonkeyes 7f7f585
tick file
dawsonkeyes 5285b15
misc fixes
dawsonkeyes 8dc8f7d
update sprites
dawsonkeyes 97157f9
evil drum
dawsonkeyes 93b62ee
evil lube
dawsonkeyes 004ca48
restricts large drum to imports under a hacked console only
dawsonkeyes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /obj/structure/reagent_dispensers/lubedrum | ||
| name = "lube drum" | ||
| desc = "You fail to comprehend valid applications for a quantity of lube this large." | ||
| icon = 'modular_doppler/lube_drum/chemical_tanks.dmi' | ||
| icon_state = "lube" | ||
| reagent_id = /datum/reagent/lube | ||
| openable = TRUE | ||
|
|
||
| /obj/structure/reagent_dispensers/lubedrum/large | ||
| name = "XXXXL lube drum" | ||
| desc = "God lives in heaven only because he fears what he has created." | ||
| icon_state = "lubelarge" | ||
| tank_volume = 5000 | ||
|
|
||
| /obj/structure/reagent_dispensers/lubedrum/evil | ||
| name = "warning-labeled lube drum" | ||
| desc = "The writing on the side and numerous red stripes indicate the contents of this drum are extremely dangerous." | ||
| icon = 'modular_doppler/lube_drum/chemical_tanks.dmi' | ||
| icon_state = "lubedanger" | ||
| reagent_id = /datum/reagent/lube/superlube |
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.