Merge Upstream 02.02.2025 #1122
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
## About The Pull Request A typo resulted in center part of fishing bar not showing up ## Changelog :cl: fix: Fixed partially missing fishing UI /:cl:
## About The Pull Request Adds two new fishing bags: normal and carpskin. Normal fishing bag can be bought from the fun vendor in the library, and is capable of holding up to 10 normal fish (and only fish), but it does not preserve them unlike stasis containers or portable aquariums. Carpskin fishing bag can hold up to 14 normal-sized fish and needs to be crafted using 3 carp skins, but is also capable of fitting fishing lines, hooks and lures. https://github.com/user-attachments/assets/80e333f5-4388-40c7-a31b-3384b96c21a1 Also resprited four normal reels and the fishing bobber:   Additionally, while I'm at it I've added the generator aquarium upgrade to service and science lathes. ## Why It's Good For The Game There's currently no good way to store smaller fish, especially when you're planning to use it as bait, so you usually end up making a mess of the room you're currently in. Carpskin bag is also a good way to organize your fishing gear without cluttering up your bag. While the aquarium upgrade is technically only used to generate power, it doesn't make sense to restrict it to engineering lathe only as its usually service and sometimes science who do fishing instead. ## Changelog :cl: add: Added fishing bags, found in fun vendors or made from carpskin. balance: Added the generator aquarium upgrade to service and science lathes. image: Resprited reels and bobber /:cl:
## About The Pull Request tgstation#88909 broke glowsticks ## Changelog :cl: fix: Fixed glowsticks not working /:cl:
## About The Pull Request Fixes large fishes going behind wallmounts like here  ## Changelog :cl: fix: Large fish should not render behind their wall mounts now /:cl:
…rch ruin. (tgstation#89303) ## About The Pull Request What it says on the tin. Mobile anomalies still spawn in and around the ruin, but never bioscramblers. ## Why It's Good For The Game A) These fucking things cannot be disabled by conventional means. It needs anomaly research. B) They drift through space away from the ruin literally every single time the ruin spawns. They are meant to be an environmental hazard for the ruin, not for the entire playing space because a remote ruin spawned. C) Because they are not blocked by walls, they will keep drifting until eventually arriving on the station, where they will stay there. Typically occupying a space perpetually until a scientist comes and fixes the problem with their anomaly neutralizer. The only reason this happened was because of bioscramblers being reworked into the state they are now. I don't imagine the original creator intended for the ruin to create problems for the wider round like this. ## Changelog :cl: del: Mobile hollow bioscramblers no longer spawn from the anomaly research ruin, sparing everyone from the inevitable unannounced arrival of a permanent hollow bioscrambler aboard the station. You maybe still encounter immobile bioscramblers in the ruin, however. /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Fixes tgstation#89261 by adding the thing This loop was present prior to tgstation#88465 , but it seems like it was deleted by accident together with some check <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Bug fix <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: fix: showers wash things under them when they're turned on again /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request https://github.com/user-attachments/assets/38218bb2-d38c-4698-afff-db75dde0597c I've used flick() which flicked the medbot icon itself instead of adding a spark overlay on top of it. ## Why It's Good For The Game Fix ## Changelog :cl: fix: Fixed medbot emag VFX /:cl: --------- Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
…T(id)` (tgstation#89291) ## About The Pull Request This makes (almost?) all traits given by status effects use `TRAIT_STATUS_EFFECT(id)` as their source, rather than the previous mix of `id`, `type`, `REF(src)`, or some bespoke thing. ## Why It's Good For The Game Consistency is good. ## Changelog No user-facing changes
## About The Pull Request Replaced "Singularity Generation Disk" with "Supermatter Crystal Shard" (and the space in front of the "prototype modsuit" has been removed, because it doesn't look pretty.) ## Changelog :cl: spellcheck: Replaced the words "Singularity Generation Disk" with "Supermatter Crystal Shard" on a paper found by the old station ruin, to match the contents of the inventory room. /:cl:
Reviewer's Guide by SourceryThis pull request merges the upstream master branch into the current branch. It includes several bug fixes, new content additions, and balance changes, primarily focused on the fishing system and some minor fixes to other game mechanics. Sequence diagram for shower cleaning processsequenceDiagram
participant S as Shower
participant T as Turf
participant A as Atoms
participant R as Reagents
S->>S: process()
S->>S: Check if on
alt shower is on
S->>S: Assemble cleaning flags
S->>T: wash(flags)
S->>T: expose_to_reagents()
loop for each atom on turf
S->>A: expose_to_reagents()
end
S->>R: remove_all(SHOWER_SPRAY_VOLUME)
end
Class diagram for new fishing bag storage systemclassDiagram
class StorageBag {
<<interface>>
}
class FishingBag {
+name: string
+desc: string
+fishing_modifier: int
+Initialize()
}
class CarpskinBag {
+name: string
+desc: string
+storage_type: datum/storage/carpskin_bag
+fishing_modifier: int
+Initialize()
}
class CarpskinStorage {
+forced_pickup: bool
+process_numerical_display()
+remove_single()
}
StorageBag <|-- FishingBag
FishingBag <|-- CarpskinBag
CarpskinBag -- CarpskinStorage
note for CarpskinBag "Special fishing bag made from carpskin
with enhanced storage capabilities"
note for CarpskinStorage "Custom storage handling for
fishing equipment categorization"
State diagram for trait status effect systemstateDiagram-v2
[*] --> Applied: Status Effect Applied
Applied --> Active: Add Traits
Active --> Removed: Status Effect Removed
Removed --> [*]: Remove Traits
note right of Applied: Uses TRAIT_STATUS_EFFECT(id)
note right of Active: Traits active with unique ID
note right of Removed: Cleanup traits with same ID
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Gaxeer
approved these changes
Feb 2, 2025
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.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Changelog
🆑 tgstation
fix: Исправлен частично отсутствующий интерфейс рыбалки.
add: Добавлены рыболовные сумки, которые можно найти в автоматах с развлечениями или изготовить из кожи карпа.
balance: Добавлено улучшение аквариума-генератора в автолаты обслуживания и науки.
image: Обновлены спрайты рыболовных катушек и поплавков.
fix: Исправлена неработоспособность светящихся палочек.
fix: Большая рыба больше не будет отображаться за настенной подставкой.
del: Мобильные полые биоскрэмблеры больше не появляются из руин исследований аномалий, избавляя всех от неизбежного без предупреждения появления постоянного полого биоскрэмблера на станции. Однако вы всё ещё можете встретить неподвижные биоскрэмблеры в руинах.
fix: Теперь душевые снова моют предметы, которые находятся под ними, если включены.
fix: Исправлены визуальные эффекты у медбота, взломанного через эмаг.
spellcheck: На документе, найденном в руинах старой станции, слова "Диск генерации сингулярности" заменены на "Осколок кристалла суперматерии", чтобы они соответствовали содержимому инвентарной комнаты.
/:cl:
Summary by Sourcery
Update showers to wash items on the ground beneath them, add fishing bags, re-sprite fishing reels and bobbers, and fix various bugs.
New Features:
Bug Fixes: