Campfires & Fireplaces Regen Energy - #7104
Open
Sulaboy wants to merge 10 commits into
Open
Conversation
github-actions
Bot
added
Feature
Sulaboy
marked this pull request as draft
July 7, 2026 07:35
Sulaboy
marked this pull request as ready for review
July 10, 2026 01:18
Buff message could be kinda spammy
realforest2001
added
the
Project Lead Approved
realforest2001
requested changes
Jul 22, 2026
realforest2001
marked this pull request as draft
July 22, 2026 16:32
Sulaboy
marked this pull request as ready for review
July 23, 2026 01:06
| holder.held_mob?.IgniteMob() | ||
| holder.update_appearance() | ||
|
|
||
| /obj/machinery/light/fueled/HasProximity(atom/movable/target) |
Collaborator
There was a problem hiding this comment.
A proximity monitor isn't needed just give a buff in view on process with a short timer so it fades quicky on it's own, don't need to remove the status effect when the campire is deleted either
Author
There was a problem hiding this comment.
This was so much easier to do than proximity monitors.
Collaborator
There was a problem hiding this comment.
Proximity monitors are helpful when you need to reduce a lot of overhead but this isn't one of those cases. It wasn't a bad idea though
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.
About The Pull Request
This PR adds a energy bonus when standing near some types of fires. Fancier fires have bigger buff ranges, but they all have the same regen rate.
I also threw in some simple descriptions for some of the light items because they were missing.
This was ported from Azure Peak.
Approved here
https://discord.com/channels/1511469905700978729/1519320057816023081
But you may not agree with what I think to be a fair energy regen rate so look at it.
This picture shows all the fires that supply the buff.
Why It's Good For The Game
The current way of regenerating energy is either to sleep (really annoying if you are out of energy and not tired), or lay on the ground (looks silly depending on where you do it). Fire regen lets you sit around a campfire and talk with people, also the inn has fireplaces which have greater range than campfires, so you are inclined to go to the inn to regenerate energy and socialize.
Changelog
🆑
add: Some fires (campfires/fireplaces) give a buff to those nearby allowing passive energy regeneration.
/:cl:
Pre-Merge Checklist