[MIRROR] Pipe painting, spraycan preset colors #605
Merged
Conversation
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
* Pipe painting, spraycan preset colors (#79521)  ## About The Pull Request Made pipe painter properly paint pipe colors, work on pipe items, and added the same functionality to regular spraycans. Spraycans now have the color presets in UI for easier selection of the valid pipe colors. ## Why It's Good For The Game Bug fixing is good. It was weird that spraycans couldn't paint pipes, but some other device could. Also custom spraycan color is too clunky, presets are nice for quick spraycan color selection. ## Changelog :cl: fix: fixed pipe painter not applying pipe color properly qol: made spraycans work also as pipe painters qol: spraycans now have basic color presets for quick selection /:cl: * Pipe painting, spraycan preset colors --------- Co-authored-by: Andrew <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Nov 13, 2023
Iajret
pushed a commit
that referenced
this pull request
Jan 25, 2024
* Kidnapping traitor objective properly returns victim (#81081) ## About The Pull Request Fixes #81022 The original idea was for kidnapping victims to be returned to the same area they were kidnapped from (dropoff_area), but this was always a typepath to an area and not a datum reference (and was set to null immediately after kidnapping with ungenerate_objective()) and it always fell back to the get_safe_random_station_turf() method. This worked fine until #80644 attempted to optimize it, causing a runtime and returning early. This removes the code to return them to the same area and instead just uses get_safe_random_station_turf(), runtime-free. ## Why It's Good For The Game Kidnapping victims now actually return to the station after 3 minutes with their stuff. I think returning to a random area is cooler than the same area they were sent from anyways, I can imagine a traitor just waiting it out if they wanted them dead and unable to snitch. ## Changelog :cl: fix: Kidnapping traitor objective now properly returns the victim to the station with their items /:cl: * Kidnapping traitor objective properly returns victim --------- Co-authored-by: Isratosh <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24974
Original PR: tgstation/tgstation#79521
About The Pull Request
Made pipe painter properly paint pipe colors, work on pipe items, and added the same functionality to regular spraycans.
Spraycans now have the color presets in UI for easier selection of the valid pipe colors.
Why It's Good For The Game
Bug fixing is good.
It was weird that spraycans couldn't paint pipes, but some other device could.
Also custom spraycan color is too clunky, presets are nice for quick spraycan color selection.
Changelog
🆑 MTandi
fix: fixed pipe painter not applying pipe color properly
qol: made spraycans work also as pipe painters
qol: spraycans now have basic color presets for quick selection
/:cl: