Shit branch #11
Open
NotActuallyMarty wants to merge 2058 commits into
Open
Conversation
* fix clustersoap eaten sprite * also assure that every entity with the SolutionContainerVisualsComponent has a AppearanceComponent * use the new sprite system + fix the fill for cardboard arrows and the mosin * fix merge issue
* Fix style classes used on monotone labels * Heading>SubHeading
* intercom resprite * fix typo * change copyright
* Add 6 new ironsand tiles Ironsand plating and ironsand tile are based on the asteroid plating and asteroid tile tiles. Ironsand concrete tiles are based on the concrete and gray concrete tiles. Packed ironsand is slightly based on smooth gray concrete, but mostly original. * Add ironsand cobble wall * Finish adding tile objects for ironsand concrete tiles Includes inhands, even though the other concrete tiles don't even have 'em. * Add cutter recipes for ironsand concrete I'm sad that I can't require iron ore for these recipes. Iron ore can't go in a cutter, though, and changing that seems like it'd be more complicated than it's worth. Assuming I don't just make the thing accept any and all ores, which... um. * Delete temporary .swp file that shouldn't have been in the repo to begin with * Add ironsand pavement tile * Add ironsand stone door * Add ironsandstone walls * Improve packed ironsand texture * Add ironsand step * Add ironsand step corner * Add three mysterious, runed pillars * Lighten ironsand wall border * Replace art for paved ironsand * Make steps more closely match paved ironsand tiles * Increase border contrast of ironstone door * Add fake "astro-" versions of ironsand tiles * Add second tall pillar sprite * Add prototype for second tall statue * Make astro-ironsand researchable and latheable * Update corner step texture to match straight steps * Add corner steps that go the other way * Add door variant to match cobbled ironsand wall * Fix license for ironsand step sprites * Darken ironsandstone walls for better contrast * Update ironstone doors to match walls and be more distinct * Remove merge conflict detritus * Fix duplicate component * Update tile stack prototypes * Add detail to copyright info * Improve ironstone wall and door destruction * Normalize ironsand statue prototypes * Normalize ironsand tile object prototypes * Move ironsand plating in with the rest of the plating tiles * Remove .gitignore additions I might just make a new PR just for this, though. I'm very tempted. * Add sound effect to ironsand step destruction * Add abstract base class to stairs and steps * Remove redundant destruction trigger behavior from cardboard door * Add destruction behavior to ironsand statues * Fix up ironsand step prototypes * Remove redundant bits from ironsandstone wall prototypes * Remove ironstone door crush behavior * Add individual ironstone statue bounding boxes * Make ironstone statues shootable * Tweak ironsand statue bounding boxes
* upgrading * Update MeleeWeaponSystem.Effects.cs * Easing
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* feat: now vacuum cleaner can suck solutions from floor * refactor using AbsorbentSystem instead of separate vacuum cleaner * refactor: remove unused vacuum cleaner files * refactor: renamed ConnectedContainerComponent to SlotBasedConnectedContainerComponent (and system) * fix: fix invalid comp name * fix: no more spray nozzle messaging about water inside bottles etc. * refactor: minor refactor in SlotBasedConnectedContainerSystem and adjustments after merge * refactor: cleanups * refactor: renaming * refactor: update to use _puddleSystem.GetAbsorbentReagents * refactor: changed interactions with SlotBasedConnectedContainerSystem into events * refactor: new sound and action delay adjusted to sound (amount tweaked a bit accordingly, almost) * refactor: added networking for SlotBasedConnectedContainerComponent * fix attribution for vacuum-cleaner-fast.ogg * trying to fix multi-license for mix sound file * remove empty line * refactor: remove trailing whitespace * by ref struct, brother --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Maintaining the status quo
fixed typo/duplicate
Fix localization missing spam from Admin Overlay (#42244) playerInfo.StartingJob is already localized Co-authored-by: Centronias <me@centronias.com>
predict thieving beacon
* init * subfolder * note
* it begins * god help me * FINALLY
…413) * jugs closeable, move chemitsry entities into chemsitry directory * forgor to stage json. I hope i didnt stage robust :anxious: * Who likes cargo? Not me. Lets remove it. * Remove seal, make the amount examinable regardless of open or not, update jug icon * apply iaada's parenting * fix issues tdw parenting * Review changes * Fix sprite rename * small touchup --------- Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: iaada <iaada@users.noreply.github.com>
* Move some miscellaneous RandomSpawners to entity tables * Fix a parenting issue and some conventions
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* remove lid * remove changelog --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
…269) I HATE STORAGE FILL
Fix admin loc spam 2 (#42265) Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* drain test * fix linter fail
Update meta.json
* init * sound * sprite, half functional construction * proper recipe * oops * loop sound * inhands * review * review squared
* init * API * testing * review * return * good enough, fix later TODO: Proper prototype DoAfter Sounds * "proper" prototype TODO DoAfter Sprite * proper protos, mortar sprite * juicer sprites TODO: Juicer sounds Makeshift crafting recipes Add regular to vendors * sprite tweak * juicing sound, cleanup, construction * vendors * line end * attribution newline * small balance tweak * Let it be known id never webedit * meta * item size * review * handhelds * partial review * cache solution, looping * graph * review * popup --------- Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Fix flatpacks ignoring costs and board requirements
Ban database refactor (#42495) * Ban DB refactor seems to work at a basic level for PostgreSQL * New ban creation API Supports all the new functionality (multiple players/addresses/hwids/roles/rounds per ban). * Make the migration irreversible * Re-implement ban notifications The server ID check is no longer done as admins may want to place bans spanning multiple rounds irrelevant of the source server. * Fix some split query warnings * Implement migration on SQLite * More comments * Remove required from ban reason SS14.Admin changes would like this * More missing AsSplitQuery() calls * Fix missing ban type filter * Fix old CreateServerBan API with permanent time * Fix department and role ban commands with permanent time * Re-add banhits navigation property Dropped this on accident, SS14.Admin needs it. * More ban API fixes. * Don't fetch ban exemption info for role bans Not relevant, reduces query performance * Regenerate migrations * Fix adminnotes command for players that never connected Would blow up handling null player records. Not a new bug introduced by the refactor, but I ran into it. * Great shame... I accidentally committed submodule update... * Update GDPR scripts * Fix sandbox violation * Fix bans with duplicate info causing DB exceptions Most notably happened with role bans, as multiple departments may include the same role.
Ban database refactor (#42495) * Ban DB refactor seems to work at a basic level for PostgreSQL * New ban creation API Supports all the new functionality (multiple players/addresses/hwids/roles/rounds per ban). * Make the migration irreversible * Re-implement ban notifications The server ID check is no longer done as admins may want to place bans spanning multiple rounds irrelevant of the source server. * Fix some split query warnings * Implement migration on SQLite * More comments * Remove required from ban reason SS14.Admin changes would like this * More missing AsSplitQuery() calls * Fix missing ban type filter * Fix old CreateServerBan API with permanent time * Fix department and role ban commands with permanent time * Re-add banhits navigation property Dropped this on accident, SS14.Admin needs it. * More ban API fixes. * Don't fetch ban exemption info for role bans Not relevant, reduces query performance * Regenerate migrations * Fix adminnotes command for players that never connected Would blow up handling null player records. Not a new bug introduced by the refactor, but I ran into it. * Great shame... I accidentally committed submodule update... * Update GDPR scripts * Fix sandbox violation * Fix bans with duplicate info causing DB exceptions Most notably happened with role bans, as multiple departments may include the same role.
Fix PostgreSQL migration for ban DB refactor (#42609) This didn't come up in testing. The ban hit foreign key was added before the data was migrated, so it didn't work. Fix that.
* fix woundmed * Fix no woundcomp entity --------- Co-authored-by: Baptr0b0t <Baptr0b0t@fake.email>
…ut and get working on a new med system
remove burnt tiles
…systems at least do it properly BRO. YOU ARE LOOKING AT CARGO IDs FOR XENOBIO. WHAT. Are we fucking for real john station what the fuck these are 4 squashed commits of me losing my mind at the code duplication present at xenobio
* Hydrakin (Goob-Station#2644) Co-authored-by: sneb <96957003+snebl@users.noreply.github.com> Co-authored-by: monolith8319 <195513600+monolith8319@users.noreply.github.com> Co-authored-by: kotobdev <59124164+kotobdev@users.noreply.github.com> Co-authored-by: NazrinNya <macrohard@macrohard.localhost> * Hydrakins 1 * Refactor Hydrakin (Goob-Station#2886) * Hydrakin Fixes (Goob-Station#2893) * Hydrakin Adjustments (Goob-Station#2903) Co-authored-by: NazrinNya <macrohard@macrohard.localhost> * Hydrakin Markings and Resprites (Goob-Station#2955) * Hydrakin Marking and Sound Update (Goob-Station#3080) * Hydrakin Minor Fixes (Goob-Station#3144) * Minor Hydrakin Marking Fix (Goob-Station#3236) * ERT Hardsuit Sprites For Hydrakin (Goob-Station#3240) * Minor Hydrakin Visual Fixes + Hunger/Thirst (Goob-Station#3243) * Adds Hunger and Thirst Processing Components to Hydrakin. (Goob-Station#3278) * [Bugfix] Actually Make Hydrakins Heat Up (Goob-Station#3369) Co-authored-by: NazrinNya <macrohard@macrohard.localhost> * Adjust Hydrakin (Goob-Station#3377) Co-authored-by: NazrinNya <macrohard@macrohard.localhost> * People No Longer Thermal Regulate While Dead, Hydrakin Do Not While Crit Either (Goob-Station#3530) * Improves Hydrakin Head Displacement (Goob-Station#3575) * final edit * fixes * thanks rsi validator * fixed * groin to json * groin png * groin rsi to yml * one letter change not vibe coded!! * pelase work surely loltart didnt lie to me * IM SO SMART im not * Update PassiveHeatGenerationSystem.cs * Minor code clarity fixes * Locale fix * Add files via upload * add attributes * ONE LINE YML CHANGE IM KILLING MYLSEF --------- Co-authored-by: Redrover1760 <39284090+Redrover1760@users.noreply.github.com> Co-authored-by: sneb <96957003+snebl@users.noreply.github.com> Co-authored-by: monolith8319 <195513600+monolith8319@users.noreply.github.com> Co-authored-by: kotobdev <59124164+kotobdev@users.noreply.github.com> Co-authored-by: NazrinNya <macrohard@macrohard.localhost> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Co-authored-by: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com> Co-authored-by: gonz0 <105350621+doktor-gonz0@users.noreply.github.com> Co-authored-by: Kiithnaras <kiithnaras@gmail.com> Co-authored-by: Roudenn <romabond091@gmail.com>
jesse where is the money Fuck Off Again but squashed Fuck off i fucking hate furslop and i'm one of them
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