-
Notifications
You must be signed in to change notification settings - Fork 565
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
Adds campfires #4091
Merged
Merged
Adds campfires #4091
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
c4caddf
Automatic changelog for PR #3470 [ci skip]
BeagleGaming1 19060a1
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 8d5e539
Merge branch 'master' of https://github.com/BeagleGaming1/cmss13
BeagleGaming1 2f04a5f
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 16fd442
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 c438267
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 6818bf0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 7d6ec07
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
BeagleGaming1 b4bb477
campfires
BeagleGaming1 d1576be
aaaaaa
BeagleGaming1 6c2f1d1
Update code/game/objects/structures/props.dm
BeagleGaming1 35630f0
Update code/game/objects/structures/props.dm
BeagleGaming1 39c2783
Update code/game/objects/structures/props.dm
BeagleGaming1 6486762
changes
BeagleGaming1 d825f3c
fix
BeagleGaming1 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
This file contains 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 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 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
Binary file not shown.
This file contains 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
Binary file not shown.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm considering moving this code up to
/obj/structure/prop/brazier