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

Adds campfires #4091

Merged
merged 15 commits into from
Aug 4, 2023
Merged

Adds campfires #4091

merged 15 commits into from
Aug 4, 2023

Conversation

BeagleGaming1
Copy link
Contributor

@BeagleGaming1 BeagleGaming1 commented Aug 2, 2023

About the pull request

Adds campfires that provide heating to those nearby, while requiring fuel

Sprites and sound by Thwomper

Explain why it's good for the game

They look cool and will allow marines, and maps, to have campfires without using braziers

Changelog

🆑
add: Adds campfires, craftable with wood
code: Modifies brazier construction code for easier use and mapping
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge Code Improvement Make the code longer labels Aug 2, 2023
state = STATE_FUEL
frame_type = /obj/structure/prop/brazier/frame/full/campfire

/obj/structure/prop/brazier/campfire
Copy link
Contributor Author

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

code/game/objects/structures/props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/props.dm Outdated Show resolved Hide resolved
code/game/objects/structures/props.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 3, 2023 16:12
@BeagleGaming1 BeagleGaming1 marked this pull request as ready for review August 3, 2023 22:16
Copy link
Contributor

@FransFeiffer FransFeiffer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sprites look nice, here's a spriter approval 👍

@FransFeiffer FransFeiffer added the Sprites Approved confirmed no stray pixels label Aug 4, 2023
@harryob harryob added this pull request to the merge queue Aug 4, 2023
Merged via the queue into cmss13-devs:master with commit 69ff181 Aug 4, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 4, 2023
@BeagleGaming1 BeagleGaming1 deleted the firepit branch September 15, 2023 02:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Feature Feature coder badge Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants