diff, but what is it really? Are we alone in the universe?#5
Open
NotActuallyMarty wants to merge 432 commits intoMoreUpstreamfrom
Open
diff, but what is it really? Are we alone in the universe?#5NotActuallyMarty wants to merge 432 commits intoMoreUpstreamfrom
NotActuallyMarty wants to merge 432 commits intoMoreUpstreamfrom
Conversation
* unchud * port stuff from rmc * fix chud client error * add barricades * minimal port of RMC InteractedBlacklist * xenos cant use cades or computers --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* add datafield for all Useds * implement Used to consume the tool and kill ValidTools * make lv work as stitches/hemostat * unchudify everything * goida * goidabook * goida --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
make wonderprod sleep mode wear off sooner Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* 🫃🫃🫃 * goida Co-authored-by: Solstice <[email protected]> * chud * clean up tajaran shitcode * stun and break ribs too --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Solstice <[email protected]>
* Fixes #4057 - Plasmaman being zombified * Fixes Zombie Immune from being Initial Infected
miku miku you can call me miku
* Moved all revenant weights to 0 * Commented out the Revenent from the events * Removed Revenent from token * Returned weight to comment * Fixed YAML Error
* aaaaaaaa * Update comment for Xenomorphs in antagonist.yml
* Added blood freshness mechanic to reagents that can contain DNA. Puddle freshness is reset every time fresher blood is added. Forensic scanner can now show how fresh is each DNA in each puddle that contains DNA. Forensic scanner can now show how long ago did a melee weapon hit someone based on DNA. Bloodtrak can now cycle through DNA on the same puddle and shows which DNA is currently selected. Bloodtrak tracking duration now depends on blood freshness. Goonstation parity? Footprint reagent storage gets cleaned once there is not enough reagent for another footprint to help alleviate some unexpected behaviour with puddles. * chore: Automatically update REUSE headers * chore: Automatically update REUSE headers * Added blood freshness mechanic to reagents that can contain DNA. Puddle freshness is reset every time fresher blood is added. Forensic scanner can now show how fresh is each DNA in each puddle that contains DNA. Forensic scanner can now show how long ago did a melee weapon hit someone based on DNA. Bloodtrak can now cycle through DNA on the same puddle and shows which DNA is currently selected. Bloodtrak tracking duration now depends on blood freshness. Goonstation parity? Footprint reagent storage gets cleaned once there is not enough reagent for another footprint to help alleviate some unexpected behaviour with puddles. * Puddle freshness is reset every time fresher blood is added. A forensic scanner can now show how fresh each DNA is in each puddle that contains DNA. A forensic scanner can now determine how long ago a melee weapon struck someone based on DNA evidence. Bloodtrak can now cycle through DNA on the same puddle and shows which DNA is currently selected. Bloodtrak tracking duration now depends on blood freshness. Goonstation parity? Footprint reagent storage is cleaned once there is not enough reagent for another footprint, helping to alleviate some unexpected behavior with puddles. * BloodTrak now gives a message if the blood sample is too dry to be used. Removed the locale lines from outside goobstation namespace. Decreased the cooldown of bloodtrak from 30 seconds to 10 seconds. Honestly the delay is somewhat irrelevant now. * Tried to un-nest the solution mixing freshness code. * Attempt to flatten the nested code in solution.cs * Update Content.Shared/Chemistry/Components/Solution.cs Co-authored-by: Aiden <[email protected]> * Addressing Rouden's requested changes. * Update ForensicScannerMenu.xaml.cs Removed redundant using. --------- Co-authored-by: GoobBot <[email protected]> Co-authored-by: Aiden <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Rouden <[email protected]>
silent footsteps actually work
…equipment. (#4023) * Added Surgery Tools & Nitrous equipment * Removed extra Nitrous from the CMO's locker * Added breath masks * Hopefully fixed surgery crate prices * Update cargo_medical.yml * fixed prices for med restock
Co-authored-by: deltanedas <@deltanedas:kde.org>
* kill shitter drones * unneeded --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
add isEquipment to switchable vision state
* Updates damage healing nest Adds space immunity and hand blocking when buckled to nest. * 3 line removed cause ssd is expensive * SpaceimmunityOnbuckle don't make spaceproof implant disapear - CliveOcelot request * Apply suggestions from code review --------- Co-authored-by: John Willis <[email protected]>
* fix: remove siliconcomponent check from cloning why would you do it that way * fix: add uncloneable to gemini
* lose useless heretics actions after HereticComponent is remove * g --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: GoobBot <[email protected]>
* newhair * Update meta.json * agh --------- Co-authored-by: Aiden <[email protected]>
* goida * goida * idk maybe this will fix it inshallah i cba reverting * dadawdqw2d * finally some good wording * dot
* change port prototypes to use LocId * add alt interact mode for interactor * add more filters * g * Update filters.yml * webedit ops 1 * webedit ops 2 --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
github-actions
bot
added
S: Untriaged
Changes: Sprites
Changes: Map
Changes: Audio
Changes: UI
and removed
S: Untriaged
labels
NotActuallyMarty
force-pushed
the
reeeebase
branch
from
dafd172 to
de190d6
Compare
NotActuallyMarty
pushed a commit
that referenced
this pull request
Oct 13, 2025
they broke my fucking glowing eye
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
20 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 PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog