master
146 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Ed
|
3409e0f752 |
Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/Overlays/StencilOverlay.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Server/GameTicking/Commands/SetGamePresetCommand.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs # Content.Shared/Clothing/Components/ClothingComponent.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/SkinColor.cs # Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml |
||
|
chromiumboy
|
499dde1ec1 |
Bug fix for APCPowerReceiverBattery (#40188)
Initial commit |
||
|
Ed
|
b8b17f7b8a |
Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Explosion/EntitySystems/TriggerSystem.cs # Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/Nutrition/Components/FoodComponent.cs # Content.Shared/Speech/ListenEvent.cs # Resources/Prototypes/Entities/Effects/admin_triggers.yml |
||
|
metalgearsloth
|
fd52f698c7 |
Predict PoweredLights (#36541)
* Move PoweredLight to shared * Predict the rest of the owl * reacher * compinit & anim * Fix names * Revert this? * Fix these * chicken drummies * deita * Fix * review * fix * fixes * fix PVS weirdness --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> |
||
|
Ed
|
f59de85047 |
Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync
# Conflicts: # Content.Client/Overlays/StencilOverlay.Weather.cs # Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs # Content.IntegrationTests/Tests/VendingMachineRestockTest.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Shared/Damage/Systems/SharedStaminaSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/GameTicking/SharedGameTicker.cs |
||
|
UpAndLeaves
|
229f33f22a | Voltage enum to shared (#38964) | ||
|
Ed
|
59e6435fe2 |
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
# Conflicts: # .github/CODEOWNERS # Content.Client/Construction/UI/ConstructionMenuPresenter.cs # Content.Shared/Construction/Prototypes/ConstructionPrototype.cs # Content.Shared/Damage/Systems/SharedStaminaSystem.cs # Content.Shared/Lock/LockSystem.cs # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Procedural/vgroid.yml |
||
|
metalgearsloth
|
bd69fc612a |
Predicted internals (#33800)
* Predicted gas pumps I wanted to try out atmos and first thing I found. * a * Atmos device prediction - Canisters - Tanks - Internals AirMixes aren't predicted so nothing on that front but all the UIs should be a lot closer. * Remove details range * Gas tank prediction * Even more sweeping changes * Alerts * rehg * Popup fix * Fix merge conflicts * Fix * Review |
||
|
Ed
|
ef6d973301 |
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml |
||
|
Kirus59
|
8c38aa3742 |
BatteryWeaponPowerCell tweaks (#33500)
* BatteryWeaponPowerCell tweaks * add update ammo ev & shuttle guns tweaks * MilonPL requested changes * revert changes in OnPowerCellChanged * Add events to get charge info & change current charge --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> |
||
|
Pieter-Jan Briers
|
ffe130b38d |
Battery (SMES/substation) interface (#36386)
* Add ENERGYWATTHOURS() loc function Takes in joules (energy), displays as watt-hours. * Add simple OnOffButton control * Re-add Inset style class This was sloppily removed at some point?? Whatever, I need it. * Add helper functions for setting title/guidebook IDs on FancyWindow Reagent dispenser uses these, more in the next commits. * Add BuiPredictionState helper This enables me to implement coarse prediction manually in the battery UI. Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server. * Add input coalescing infrastructure I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value. There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up. I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic. In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for. Adding new coalescing logic should be possible in the future, of course. It's all just small helpers. * Battery interface This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great. This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW. * Oops, forgot to remove these style class defs. |
||
|
Tayrtahn
|
e0870d0cd2 |
Cleanup: ExtensionCableSystem (#36052)
* Use Entity<T> and avoid Owner * Use SharedMapSystem |
||
|
Ed
|
0a46df78ea |
Upstream sync (#1035)
* Add new implants to deimplant list (#35563) Initial commit * Doxarubixadone Description Fix (#35568) Changed medicine.ftl for Doxa. * Reptilians Can Eat Chicken Nuggets (#35569) Added meat tag to misc.yml for chicken nuggets. * Automatic changelog update * Unheck Admin Smites (#35348) * Fix admin verb names Fixed admin verb names. * Add antag verb names * Adjust antag verb icons * Amber Station - A Couple Changes (#35548) * [ADMIN] Minor Refactor AdminNameOverlay (#35520) * refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player * fix(src): Add configure classic admin owerlay * fix * tweak(src): Use _antagLabelClassic and tweak style * tweak(src): Add config display overlay for startingJob and playTime * tweak(src): Vector2 is replaced by var * tweak(src): return to the end of the list * Automatic changelog update * Wizard PDA (#35572) * wizard PDA * colour change to brown * Automatic changelog update * Increase line spacing of the admin overlay (#35591) line spacing * make slime hair less transparent (#35158) * blabl blump or something * +0.3 * blimpuf * Automatic changelog update * Fix being able to write on/stamp/fax paper scrap (#35596) * init * item * requested changes * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Changed Pride to Hubris in ion_storm.yml (#35602) Update ion_storm.yml * Sentry turrets - Part 3: Turret AI (#35058) * Initial commit * Updated Access/command.yml * Fix for Access/AccessLevelPrototype.cs * Added silicon access levels to admin items * Included self-recharging battery changes * Revert "Included self-recharging battery changes" * Addressed reviewers comments * Additional reviewer comments * DetGadget Hat Revitalization (#35438) * DetGadget Hat * uh... half-assed item description * Reduce hat range to one tile, you have to stand on someone to steal their hat items * Fix Integration Errors * Only the wearer can access voice commands * init work - handscomp is unable to be pulled * second bit of progress * basic working implementation * nuke storageslots and add adminlogging * disallow trolling nukies or hiding objective items * remove unnecessary tags additions * finish nuking unused tags * death to yamllinter * int tests be damned * milon is a furry * address review * upd desc * address reviews part 2 * address more reviews * remove unused refs * fix order of dependencies * add ShowVerb to SharedStorageSystem.cs This will allow or disallow showing the "Open Storage" verb if defined on the component. * orks is a nerd * add proper locale, fix adminlogging * orks is a nerd 2 --------- Co-authored-by: Coenx-flex <coengmurray@gmail.com> * Automatic changelog update * Fingerprint Reader System (#35600) * init * public api * stuff * weh * Remove cellular resistance for slimes (#35583) * Remove cellular resistance for slimes * Update guidebook * Automatic changelog update * Give the station map inhand sprites (#35605) map has inhands * Reagent guidebook reactions UI dividers (#35608) * Update GuideReagentReaction.xaml * Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * fix cluwne pda pen slot (#35611) Co-authored-by: deltanedas <@deltanedas:kde.org> * Revert "Make radioactive material radioactive" (#35330) * Automatic changelog update * Predict vending machine UI (#33412) * Automatic changelog update * #32209 changelog (#35619) Since it was merged into staging no changelog was made, but we should at least have it for next release. (And vulture) * Automatic changelog update * Cloning Refactor and bugfixes (#35555) * cloning refactor * cleanup and fixes * don't pick from 0 * give dwarves the correct species * fix dna and bloodstream reagent data cloning * don't copy helmets * be less redundant * Automatic changelog update * centcomm update (#35627) * Better Insectoid Glasses (#31812) Sprites and file changes Adds the variants for arachnid and moth glasses, adds the code for those in the meta.json files, and adds the speciesID tag in both arachnid and moth prototype files. * Automatic changelog update * Add GetBaseName method to NameModifierSystem (#35633) * Add GetBaseName method to NameModifierSystem * Use Name * Save Space Station 14 from the Toilet Gibber Forever (#35587) * The evil is defeated * Tag body bags * uwu, cwush me cwusher-chan * absolute 18+ sloggery * botos binted? 👽 * Automatic changelog update * Changed Damage Overlay to check Burn Damage (#34535) * updated BruteLevel to be PainLevel with burn damage checks in DamageOverlayUiController.cs * dehardcoded pain level by adding damage groups to paindamagegroups to affect * re-added the name for painDamageGroups * fixed overlay default and added minimum limit to component check first * renamed to PainDamageGroups and removed obsolete tag * Automatic changelog update * Wizard's Magical Pen (#35623) * wizard pen * description change * Automatic changelog update * Added decelerator percentage drain (#35643) * Added variable PercentageDrain to SinguloFoodComponent * Set percentageDrain to 0.03 (3%) for anti particles * Added percentageDrain logic in public OnConsumed * Simplify SinguloFoodComponent and set percentageDrain to negative * EnergyFactor now applies to positive values too * Better commenting on EnergyFactor * Update Content.Server/Singularity/Components/SinguloFoodComponent.cs * Documentation of EnergyFactor * Fixing spelling mistake --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Made butter require less milk (#35650) made butter take less milk * Automatic changelog update * Delete SolutionContainerVisualsComponent.InitialName (#35654) * Fix name of cotton dough rope (#35657) changed in-game name of cotton dough rope to differentiate from normal dough rope * CVar - Toggle display of round-end greentext (#35651) * hide greentext if cvar false * change IFs around a lil * reviews * Open State for cowtools (#35666) Open State * Make implants unshielded (#35667) * Add undergarments & "Censor Nudity" toggle to options (#33185) * Initial commit * Attribution * Review changes * Added comment for upstream * Automatic changelog update * centcomm update (#35674) * More scars! (#35644) * :3 * whitespace, stomach scar * Automatic changelog update * Lathe menu UI displays a count of available recipes (#35570) * commit * jumped the gun * changes * Players with unknown playtimes now are tagged as new players, take 2 (#35648) * your commit? our commit. * skreee * show joined players before lobby players; comments * comments * playerinfo retains playtime data after disconnect * new connection status symbols * Automatic changelog update * Add firelocks and locked external airlocks to ATS (#35516) * Add firelocks and locked airlocks to ATS * Add fire alarms * Elkridge Tesla and TEG Improvements + Other stuff (#35684) * better tesla, better TEG, better sci maints, chef gets chef closet * added storage room for tesla parts, added captain bathroom, changed vault so nuke can be armed * ran fixgridatmos and added some vacuum markers * unflatpacked containment shit * Cargo Mail System (#35429) * shitcode init * biocoding, SpawnTableOnUse, Moving shit to shared * server :( * fixes * ok works * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintMaskComponent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintComponent.cs * Discard changes to Content.Server/Forensics/Systems/ForensicsSystem.cs * Discard changes to Content.Server/StationRecords/Systems/StationRecordsSystem.cs * Discard changes to Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * big stuff * preperation * temperory spawning thing for testing * Update CargoDeliveryDataComponent.cs * kinda proper spawning idk god save me * cleanup (kinda) * preparation 2.0 * stuff i think * entity table work * renames * spawn ratio based on players * comment * letter tables * more spam * package tables * comment * biocodedn't * builds correctly * cleaning * Update deliveries_tables.yml * labels * package sprites * mail teleporter * revert testing value * fix test * fix other test * i love tests * mail teleporter enabled by default * random cooldowns * fixtures * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderComponent.cs * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Resources/Locale/en-US/fingerprint-reader/fingerprint-reader.ftl * clean * fuck paper scrap * oops * fuck SpawnTableOnUse * mail teleporter board in QM locker + addressed review * oops * clean * sound on delivery spawn * address review * partial review address * partial review addressing * addressing partial review * pratarial revivew address * misprediction hell * stuff * more stuff * unrelated * TODO * link * partial review * DirtyField --------- Co-authored-by: Milon <milonpl.git@proton.me> * Automatic changelog update * Add AssertMultiple to ContrabandTest (#35662) * add AssertMultiple to ContrabandTest * do the same for magazine visuals test * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * add forceghost admin command (#35518) * add forceghost admin command * sweep linq under the rug * braces * ûse LocalizedEntityCommands * Automatic changelog update * Text related keybinds can now be changed in Controls (#35630) * Add ability to rebind text related keybinds * fix placement of locales * Automatic changelog update * Update b2dynamictree (#30630) * Update submodule to 248.0.0 (#35720) * Add sun shadows (planet lighting stage 2) (#35145) * Implements a Dynamic Lighting System on maps. * Edit: the night should be a little bit brighter and blue now. * Major edit: everything must be done on the client side now, with certain datafield replicated. Changes were outlined in the salvage to accommodate the new lighting system. * Edit: The offset is now serverside, this makes the time accurate in all situations. * Removing ununsed import * Minor tweaks * Tweak in time precision * Minor tweak + Unused import removed * Edit: apparently RealTime is better for what I'm looking for * Fix: Now the time is calculated correctly. * Minor tweaks * Adds condition for when the light should be updated * Add planet lighting * she * close-ish * c * bittersweat * Fixes * Revert "Merge branch '22719' into 2024-09-29-planet-lighting" This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86. * Europa and day-night * weh * rooves working * Clean * Remove Europa * Fixes * fix * Update * Fix caves * Update for engine * Add sun shadows (planet lighting v2) For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish. * Documentation * a * Fixes * Move blur to an overlay * Slughands * Fixes * Apply RoofOverlay per-grid not per-map * Fix light render scales * sangas * Juice it a bit * Better angle * Fixes * Add color support * Rounding bandaid * Wehs * Better * Remember I forgot to do this when writing docs --------- Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com> * Automatic changelog update * Omega Mail Teleporter (#35705) Mail! * Packed Mail Teleporter (#35706) Mail! * Box Mail Teleporter (#35707) Mail! * Oasis Mail Teleporter (#35708) Mail! * Meta Mail Teleporter (#35709) Mail! * Marathon Mail Teleporter (#35710) Mail! * Fland Mail Teleporter (#35711) Mail! * Plasma fixes 4 (#35716) Fixes 15 Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> * Aroace pride pin, scarf, and cloak (#35718) cloak, pin, and scarf added yayyyy * Automatic changelog update * [Part of #32893] Localize silicon dataset names (#33352) * Localize ai names * Apply requested changes * Localize autoborg * Localize borg names * Localize atv names * Correct prototypes ids to follow naming conventions * Remove AI localization (Moved to another PR) * Weh * [Part of #32893] Localize arachnid dataset names (#33353) * Localize arachnid dataset names * Correct prototype ids to follow naming conventions * Combine arachnid_first.yml and arachnid_last.yml * Upstream names * [Part of #32893] Localize summonable creatures dataset names (#33392) * Localize clown names * Localize golem names * Localize hologram names * Correct prototype ids to follow naming conventions * Update Resources/Locale/en-US/datasets/names/golem.ftl --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize antagonists dataset names (#33393) * Localize fake human names * Localize ninja names * Localize operation names * Localize regalrat names * Localize revenant names * Localize syndicate names * Localize wizard names * Correct prototype ids to follow naming conventions * Combine fake_human_first.yml and fake_human_last.yml * Move contents of ninja_title.yml into ninja.yml * Combine Operation_prefix.yml and Operation_suffix.yml * Combine wizard_first.yml and wizard_last.yml * Upstream names * fix wizard --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize humanoid species dataset names (#33395) * Localize diona names * Localize moth names * Localize mushman names * Localize reptilian names * Localize skeleton names * Upstream diona names * names-moth-male/female-first-dataset -> names-moth-first-male/female-dataset * Correct prototype ids to follow naming conventions * NamesSkeletonFirst -> NamesSkeleton * Combine moth_first_female.yml, moth_first_male.yml and moth_last.yml * Forgot about skeleton prototype * Upstream names * Update Resources/Locale/en-US/datasets/names/diona_last.ftl * Update Resources/Locale/en-US/datasets/names/diona_last.ftl * keep first name for skeleton --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize vox dataset names (#33396) * Localize vox names * Correct prototype id to follow naming conventions * Upstream names * [Part of #32893] Localize first & last dataset names (#33401) * Localize first names * Localize last names * Correct prototype ids to follow naming conventions * Combine first.yml and last.yml into base.yml * Forgot about = in last * [Part of #32893] Localize first male & female dataset names (#33402) * Localize first_name * Localize first_female * names-male/female-first-dataset -> names-first-male/female-dataset * Correct prototype ids to follow naming conventions * Combine first_male.yml and first_female.yml into base_gendered.yml * [Part of #32893] Localize misc dataset names (#33404) * Localize cargo_shuttle names * Localize death_commando names * Localize fortunes * Localize military names * Localize rollie names * fortunes.ftl -> cookie_fortune.ftl * Correct prototype ids to follow naming conventions * Localize all dataset names (#32893) * Use `LocalizedDatasetPrototype` instead of `DatasetPrototype` in `RoleLoadoutPrototype` * Localize ai names * Replace to `LocalizedDatasetPrototype` in `NamingSystem` * Localize arachnid first and last names * Localize atv names * Localize autoborg names * Forgot to change type to localizedDataset * Localize borer names * Localize borg names * Localize cargo shuttle names * Localize clown names * Localize death_commando names * Localize diona names * Localize fake_human names * Localize first and last names * Localize first male and female names * Localize fortunes descriptions * Forgot about equal sign * Localize golem names * Localize hologram names * Localize military names * Localize moth first male and female names * Localize moth last names * Fix autoborg name error * Localize mushman first and last names * Localize ninja names * Localize operation names * Localize regalrat names * Fix mushman_first * Forgot about `Loc.GetString` * Move comments into comment section & fix names * Localize reptilian male and female names * Localize revenant names * Fix locale word order in operation * Localize rollie (btw it was never used and was added as "for the futuгe" long time ago) * Localize skeleton_first names * Localize syndicate names * Localize vox names * Localize wizard first and last names * `{owner}-name-dataset` -> `names-{owner}-dataset` * Change `DatasetPrototype` to `LocalizedDatasetPrototype` and make sure it works properly GetFTLName is no more the static method, we need it to be able to use `Loc.GetString` * I hate those mothname comments * Combine name datasets prototypes * Move every ftl from` /en-US/names` to ` /en-US/datasets/names` * Remove ftl files * Get every dataset yml back * Remove changes for planets. Move it in another PR * Revert these changes (Moved to another PR) * How * Apply suggested changes * Fix integration tests (#35727) * test * fix names * fix more * Initial delivery balance changes (#35728) * init * small balance * guess not * Update Content.Server/Delivery/CargoDeliveryDataComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fixed delivery popups (#35724) * :) * cool stuff * Remove a bonus Loc.GetString (#35731) oops * Bagel Engineering Improvements (#35717) * woe, better engineering be upon ye * im going to lose it * radical plan * oopsie * Revert "oopsie" This reverts commit 45ab057f55b46acd795e58257c3cc5967e5cb946. * Revert "radical plan" This reverts commit 57b1ae081725a47aef3ae03111cecbc91b4f47a8. * Revert "im going to lose it" This reverts commit e7b4afaf5d9a10a42e89831ffc9294d3b9bd96d4. * Revert "woe, better engineering be upon ye" This reverts commit 471dc3716b58a39631aa8bee00de79e981391d63. * complete revamp * revision * oops 2 electric boogaloo * another one * every time i push to fix a minor mistake i found in walking around i get closer to my limit * Update Credits (#35733) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Loop mail teleporter (#35729) * latejoin * youve got mail * Core mail update (#35719) * core mail update * empty * derotate core (#35740) Update default.yml * Elkridge Mail Update (#35738) add mail teleporter and mailing unit system * Automatic changelog update * Plasma Mail Teleporter (#35741) Mail! * Convex Mail Teleporter (#35742) Mail! * Remove unneeded Loc.GetString (#35739) * Steal the mail thieving objective (#35746) * mail theft * networked * Automatic changelog update * fix UpdateBankAccount (#35749) * trolled * fun * fuck me * Slightly better letter loot table (#35748) * init * review --------- Co-authored-by: Milon <milonpl.git@proton.me> * Python Suit Storage Visual (#35593) * Python-SUITSTORAGE-Visuals Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * REVised Sprite Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Copyright Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Update Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * fix nukeops commander name (#35753) * bagel update (#35754) * Predict some power PowerReceiver stuff (#33834) * Predict some power PowerReceiver stuff Need it for some atmos device prediction. * Also this * Localize traitor codeverbs datasets (#35737) * Localize verbs dataset * Localize adjectives dataset * Localize corporations dataset * Update TraitorRuleSystem to use LocalizedDatasetPrototype instead of DatasetPrototype * Fix sun shadows in ANGLE (#35757) I think I fat-fingered a ctrl-Z on this at some point but the intermediate blur is necessary. * Automatic changelog update * Tweak sun shadow rotations (#35758) Won't use the entity's rotation for the matrix, I just forgot to do this. Means shadows will always point in the same direction and the points will correctly adjust as the entity rotates. * Automatic changelog update * Fix Ahelp window playerlist resize (#35747) reorganize bwoink window layout * Automatic changelog update * Ensure speech bubble cap is always respected (#32223) Ensure speech bubble cap is respected, even when messages are sent very fast * Cleanup: Fix ``PaperWriteEvent`` in ``PaperSystem`` (#35763) * Cleanup + fix * Revert * Cleanup: Add missing locale ``cmd-planet-map-prototype`` (#35766) Cleanup * Added New Cocktails and new fill level sprites to existing drinks. (#33570) * Added New Cocktails and new fill level sprites to existing drinks * Updated copyright info and fixed recipies for Caipirinha/Mojito. --------- Co-authored-by: RedBookcase <Usualmoves@gmail.com> * Automatic changelog update * Performer's Wig (#35764) * miku wig * fix to correct json convention Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> * Automatic changelog update * Merge showsubfloorforever into showsubfloor (#33682) * convex fix * Removable mindshields and revolutionary tweaks. (#35769) * I fucking hate revs * Update preset-revolutionary.ftl * fixy fix * Automatic changelog update * Mail Resprite (#35776) * init commit * init commit * delete those * added github to copyright info * Fix Chameleon PDAs renaming the user in station records (#35782) * Automatic changelog update * Restore the order of admin overlay elements (#35783) admin overlay order fix * Automatic changelog update * Fixes and refactoring to discord changelog script (#33859) * Fixes and refactoring to discord changelog script Upstreamed from https://github.com/impstation/imp-station-14/pull/1023 * Add some prints back in * Update to borg ion storms (#35751) * Updates ion storms for borgs. * Remove additional ion laws into future PR * Automatic changelog update * TriggerSystem improvements (#35762) * desynchronizer real * yaml stuff from slarti branch * C# stuff * oops * fix triggers * atomize PR --------- Co-authored-by: Flareguy <woaj9999@outlook.com> * Roleban command error handling (#35784) roleban command jobid fail handling * Localize news dataset (#35774) * Localize news dataset * Remove the `"` * Localize rat king commands datasets (#35780) * Added mail room * Update submodule to 248.0.2 (#35787) * Update Space Law to reflect Implant changes (#35701) * Change implanter Space Law * Add clarification regarding unidentified implanter vs. unidentified implant sentensing * Add support for antag-before-job selection (#35789) * Add support for antag-before-job selection * Include logging * forensics cleanup (#35795) * polymorph popup fixes (#35796) polymorph fixes * fix more syndicate names (#35788) * New Feature: Warden job rolls before security officer/cadet/detective (#35313) Commit * Automatic changelog update * Fix anomaly doublelogging (#34297) cull doublelogging * Add wallmount N2 closets, Revived (#34042) * Add standard, wallmount and improvised N2 closets, Revived * remove improvised locker * Parent>ID * Undo sprite replacement * Update meta.json --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: Milon <milonpl.git@proton.me> * Cryo and grinder cleanup (#34842) * cryopod and grinder cleanup * lower case name * 4 spaces * prototype clean * looks like there is some kind of test that prevents removing this * grinder too * both should be empty * cleanup * Add Gold and Coal Rock Anomalies (#34809) * This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both. * Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time. * Sorted tags.yml alphabetically this time instead of not doing that. * Updated Texture Copyright information * Attempted to fix Merge Conflict * Added bulb light variants for both yellow and black crystals. * Automatic changelog update * Tools/Devices: In-hand Sprites (#33689) * Adds in-hand sprites to the barber scissors. * adds in-hand sprites to the floodlight. * adds in-hand sprites to the gas analyzer. * adds in-hand sprites to the gps. * Update copyright wording, linting * resprite gps inhand sprites. * adds in-hand sprites to the mass scanner. * adds in-hand sprites to the spray_painter. * resprite in-hand sprites to the mass_scanner. * fix in-hand sprites to the mass_scanner. * Resprite mass_scanner in-hand sprites. * Automatic changelog update * IconSmooth additional smoothing keys (#35790) * additionalKeys * Update lava.yml * Update Content.Client/IconSmoothing/IconSmoothComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Locks nitrous oxide canisters (#35785) lock nitrous oxide canisters * Automatic changelog update * Cleanup Objective files, add PickSpecificPersonComponent (#35802) * cleanup objectives * remove unrelated access restriction * review * Adds popup when firing gun while gun has no ammo (#34816) * Adds popup when firing gun while gun has no ammo * simplify --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Add the ability to pet the mail teleporter (#35819) good mailbox * Automatic changelog update * Whitehole/Singularity grenade price adjustments + whitehole grenade fix (#35821) * prices + adjustments * teehee * Automatic changelog update * Update Lobby Music Attribtions (#35817) Biggest change is updating the attributions and links for Sunbeamstress' to reflect the changes in their online profile as the previous link is now a dead link. Updated Comet Haley's link to go directly to Stellardrone's Bandcamp instead of diverting to Free Music Archive Fixed a double the in the comment for Space Asshole * Paradox Clone (#35794) * polymorph fixes * paradox clone * forensics cleanup * bump doors * 4 * attribution * polymorphn't * clean up objectives * Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml * review * add virtual items to blacklist * allow them to roll sleeper agent * Automatic changelog update * Improvements to antag-before-job selection system (#35822) * Fix the latejoin-antag-deficit bug, add datafield, add logging * Fix multiple roles being made for single-role defs, * HOTFIX: Fix paradox clone event (#35858) fix paradox clone event * Update CP14TownSendConditionSystem.cs --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Smith <182301147+AgentSmithRadio@users.noreply.github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Pancake <Pangogie@users.noreply.github.com> Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com> Co-authored-by: Velken <8467292+Velken@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Coenx-flex <coengmurray@gmail.com> Co-authored-by: hivehum <ketchupfaced@gmail.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: Coolsurf6 <coolsurf24@yahoo.com.au> Co-authored-by: rokudara-sen <160833839+rokudara-sen@users.noreply.github.com> Co-authored-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> Co-authored-by: MisterImp <101299120+MisterImp@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: āda <ss.adasts@gmail.com> Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com> Co-authored-by: Deerstop <edainturner@gmail.com> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com> Co-authored-by: compilatron <40789662+Compilatron144@users.noreply.github.com> Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Momo <Rsnesrud@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com> Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: Evelyn Gordon <evelyn.gordon20@gmail.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: RedBookcase <crazykid1590@gmail.com> Co-authored-by: RedBookcase <Usualmoves@gmail.com> Co-authored-by: SpaceManiac <tad@platymuus.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: imcb <irismessage@protonmail.com> Co-authored-by: valquaint <57813693+valquaint@users.noreply.github.com> Co-authored-by: Flareguy <woaj9999@outlook.com> Co-authored-by: ninruB <ninrub@tuta.io> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: Łukasz Lindert <lukasz.lindert@protonmail.com> Co-authored-by: Firewars763 <35506916+Firewars763@users.noreply.github.com> Co-authored-by: onesch <118821520+onesch@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Crude Oil <124208219+CroilBird@users.noreply.github.com> Co-authored-by: Lusatia <ultimate_doge@outlook.com> |
||
|
metalgearsloth
|
75a7407e33 |
Predict some power PowerReceiver stuff (#33834)
* Predict some power PowerReceiver stuff Need it for some atmos device prediction. * Also this |
||
|
metalgearsloth
|
1d004f4945 |
Sentry review (#35424)
Co-authored-by: chromiumboy <chromium.boy@gmail.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> |
||
|
chromiumboy
|
066c773965 | Sentry turrets - Part 2: Basic prototype (#35031) | ||
|
Ed
|
a0a827ea5a |
Upstream sync (#846)
* Additional Ionstorm Law Updates (#34197) * Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment" * Fixed another awkward grammar situation * Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas * Reverted pylons, and added more entries to help fill out the lists more * reverted all deletions * implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there * realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error * Removed Portugal again, added more Musts since that list was the new shortest one. * Automatic changelog update * Add option to disable bwoink sound. (#33782) * Add option to disable bwoink sound. * Now it's working only with active admin status. * No bwoink, only "notification sound" * Moar changes * Another one * Automatic changelog update * Pride Scarves (#34448) * More scarfs (#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix * Resolved merge conflict * Moved scarves around * Moved scarf textures out of the _CD directory * Removed final CD folder * Removed extra scarfs * Removed extra scarfs, again * Replaced ClothingNeckBase with ClothingScarfBase --------- Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com> Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com> * Automatic changelog update * Replace the djstation intercoms with freelance intercoms (#34478) * Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys * removed a new line * Update nix flake for .NET 9 (#34480) * Automatic changelog update * Holopad networking rework (#34112) * Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references * Make GasMixture enumerable I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works. * Improve canister admin logs. 1. Now clearly says "opened"/"closed" when changing the release valve. 2. Clearly says whether the valve was opened while a canister was inserted or not. 3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment. Fixes #34488 * Optimize & clean up RadiationSystem (#34459) * Optimize & clean up RadiationSystem * comments * Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update engine to v240.0.1 (#34497) * Various Locale Typo Fixes (and spaces) (#34483) Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that) * Space lizard plushie can now be worn on your head (#33809) * space weh can now be work on top of head * space weh can now be worn on top of head * trim out unnecessary comps * Automatic changelog update * Adds bullet collision to wall mounted cameras (#34500) * Automatic changelog update * Change MaskComponent to accommodate sprites namings (#33451) Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> * Automatic changelog update * Add a 10u vial of plasma to the chemical locker (#33871) Add 10u plasma to the chemistry locker so the chemists stop stealing tables. * Automatic changelog update * Rarer Highcaps (#34469) * Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5 * Automatic changelog update * New dry fire sound (#34447) * new empty.ogg * source to tg commit * Automatic changelog update * CentComm Map Updates (#34475) * Bandage fix denied animations playing on devices without them * CentComm blast door prototype * CentComm button * CentComm window shutters * CC Updates * Save as grid * Remove an extra detective figurine I like them better in the interrogation room * Remove paramed locker, let pumps shut off * Fix wrong HOP locker prototype * Automatic changelog update * Cog power setup fix (#34188) * many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa * decals and maints * aaa * bbb * ccc * cog power setup was bad * made it artsy --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Add Airlocks with Bar and Kitchen access (#33821) * Add kitchen access to Bar-Cafeteria airlocks on Cog * Fix merge conflict * Remove mapping changes * Add Glass and Maints versions * Fixed minor spelling mistake in Noir Trenchcoat description. (#34519) Update coats.yml * Update Credits (#34507) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Make storage implant drop items on gibbing (#33493) * Make storage implant drop items on gib/removal * Better way * Fix error * Forgotten trash * Cleanup * Unused var * Update Content.Server/Implants/ImplantedSystem.cs Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: 0x6273 <0x40@keemail.me> * Automatic changelog update * Fix `emergency_elkridge` being saved as a map (#34496) Save `emergency_elkridge` as a grid * Update engine to v240.1.0 (#34524) * Fixes some mobs not being able to honk/weh (#33777) * fixes some mobs not being able to honk/weh * addresss review * Automatic changelog update * Welding gas mask toggleable with action (#32691) welding mask removable * Automatic changelog update * Update engine to v240.1.1 (#34527) * Automatic changelog update * Plasma Dirt Fix (#34534) did the dirt thing * Plasma station population tweak (#34549) * Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts * Update population caps Removed population cap of 60 players to make plasma into a highpop map - it's that easy! --------- Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * Job contraband rework (#33385) * contraband system rework to allow restriction by job, not just department * Fixing detective trenchcoat inheritance * removing unnecessary using declarations * trying to fix testing error by re-adding diagnostics using declaration * removing unecessary dependency, making allowedJobs nullable * Adding all of slarti's requested changes except for the hacky job icon method fix * removing accidental whitespace * choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english * removing unneeded using dec, fixing nesting logic problem * didn't remove the old nesting, doing that now * using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead. * rewrite some stuff * fixes * fix energy pen --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502) * new tips to open doors (throwing PDA/ID, dragging body) * electrified door sprite for players * tooltip to reset AI electrified doors * windoor electrified sprite * highsec electrified visual * increase tip dataset to 138 * corrected square bracket convention in this commit * removed door corpse tip from prior commit * Automatic changelog update * Blueprint double emergency tank (#34232) * blueprint * NitrogenTank * description * Automatic changelog update * Add system to kick people if they connect to multiple servers at once. (#34563) * Automatic changelog update * bagel update (#34572) * bagel update * Decal fault tolerance * Also fix writes * fix mv cable, decal issues, yar * fix a floor tile and some other shit --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * remove tropico from devmap (#34585) * Update wizden config to disallow multiple connections to multiple wizden servers (#34584) * Give the chef access to cloth boxes (#34403) * Give the chef access to fiber bags * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * lecter visual update (#34589) * Automatic changelog update * Box Station - Update (#34605) * Various changes * Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well * Added reporter to prototype, and fixed dirt * Resolved outstanding issues * Fixed a floating camera * pluralize the job name in the contra description (#34559) * pluralize the job name in the contra description * pluralization specific to contraband descriptions * Automatic changelog update * Feature/make radial menu great again (#32653) * it works! kinda * so it works now * minor cleanup * central button now is useful too * more cleanup * minor cleanup * more cleanup * refactor: migrated code from toolbox (as it was rejected as too specific) * feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame * refactor: major reworks! * renamed DrawBagleSector to DrawAnnulusSector * Remove strange indexing * Regularize math * refactor: re-orienting segment elements to be Y-mirrored * refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button * refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius. * refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters * refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly * fix: enabled any functional keys pressed when pushing radial menu buttons * fix: radial menu sector now scales with UIScale * fix: accept only one event when clicking on radial menu ContextualButton * fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Automatic changelog update * Return Drozd full-auto and semi-auto firing modes (#34604) return drozd full auto and firerate, arrange available modes in alphabetical order * Automatic changelog update * added missing allowed department to the restricted severity (#34558) * added missing allow job to the base restricted severity * no need to make a list * no more linq in ContrabandTest * less nesting in ContrabandTest * Automatic changelog update * C4 Helmet (#34076) * worn bomb * Update meta.json * Update meta.json * Automatic changelog update * Make radioactive material radioactive (#34436) * Make radioactive material radioactive * Increase the slopes of item uranium No free power for engineering * Glowing uranium * Revert "Increase the slopes of item uranium" This reverts commit 2acbda26 * Nerf Wall Rocks * Automatic changelog update * Small fixes for Meta station (#34613) * Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory. * Added back salvage shuttle equipment, now in a crate * Fix * replace all instances of "department-{id}" with department.name (#34607) replace all instances of "department-{id}" with department.name" * Renaming sexy mime and clown mask (#34258) * Renamed sexy clown and mime mask and removed lusty xenomorph poster. * removing odd file changes. not sure why these were edited at all. * gaaaahhh * removed some of the old templates * Renaming sexy mime and clown instances. * removed unwanted gitignore edit * Renaming sexy clown and sexy mime mask and Removing lusty exomorph poster. * Remove lusty xenomorph poster. * reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits * requested changes * lusty migration removal * dirty hanging whitespace * correct date format comment --------- Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com> * Automatic changelog update * Moved Cyborg Recharging Circuit Board from Lathe to Circuit Imprinter (#34612) Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter * Automatic changelog update * Replace starter borg brain with Positronic (#34614) THE FLESH IS WEAK * Automatic changelog update * Elkridge Depot fixes and changes (#34539) * fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller * added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot * removed interrogator lamp and some more gamer loot * fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault * added clothing drobes to arrivals, added bin to HoP, more stuff i forgot * i forgot to move the file from /bin to /resources... * delete radstorm locale (#34630) * display the current version in the changelog window (#34556) * just works first try * introduce more magic numbers into the codebase * idiot doesnt know the difference between AND/OR * Update Credits (#34644) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224) * New solar sprites, new solar panel upgrades, and some solar panel fixes. This adds and changes a few things for solar panels! * New sprites for all solar panels and all related states. * Move from xform.WorldRotation to _xformSystem.SetWorldRotation within the solar code. * Few random fixes that Rider suggested as warnings. * Solar Tracker Electronics was using what looks like to be the airlock controller electronics, so that's now updated to something a bit more realistic. It also uses the engineering circuit sprite instead of the generic * New Solar Panels! Adds Plasma and Uranium Glass solar panels. These can be constructed by adding the respective glass to the panel. Plasma is a slight increase of power and health, and uranium is double the power and health of glass. Thus giving engineers something to update if they want to use solar panels and possibly giving small outposts a way to make a bit more power without a large and complex power setup. * Add in solar sprites that were not in the meta file. * Updated sprites based on feedback. * Fix the rotation of the solar panel sprites. * Automatic changelog update * Added Unused HoS's Flask to HoS locker (#34658) added hos flask to locker spawn * Automatic changelog update * Fland Fix (#34670) Update fland.yml * Reroute Meta station power, engineering cosmetic changes, minor fixes (#34669) * reroute meta power plus cosmetic fixes * fix a lot of other things * make changes from conflict * Amber Station Changes (#34656) * various changes * Increased player limit * slight modification * Followed proper yaml formatting, increased lawyers * Box Station Changes (#34655) * Various changes * Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well * Added reporter to prototype, and fixed dirt * Resolved outstanding issues * Fixed a floating camera * Added cameras to TEG, and some minor changes * Fix mv cable crate typo (#34673) fix mv cable crate typo * Plasma station patch 1 (#34602) * Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts * Update population caps Removed population cap of 60 players to make plasma into a highpop map - it's that easy! * Map fixes 11 * Map fixes 12 * Map fixes 13 * Map fixes 14 Now it's personal * Map fixes 15 --------- Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * add a chem dispenser to the nukie planet (#34674) * add a chem dispenser to the nukie planet * begone test fail * Adds better description to pneumatic valve and build menu description (#32655) * adds description to pneumatic valve and build menu description * Change one atmosphere to kPa * Automatic changelog update * fixrotations - Modified Targetted Entities (#34638) * Fix match box (#34632) FixMatchBox Now you can't put anything but matches in a box of matches. Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com> * Automatic changelog update * Hi-viz vest now actually hi-viz (#34087) * 27-12-2024-light-hi-viz * 28-12-2024-meta-fix * Storage UI V2 (#33045) * Automatic changelog update * Added Pain Numbness Trait (#34538) * added pain-numbness component and system * added numb as a trait that pulls the pain numbness component * removed new event as mob threshold event as already being fired * checked for MobThresholdsComponent first before running VerifyThresholds * refacted force say to using LocalizedDatasetPrototype and added numb messages * added severity check alert * added comment for BeforeForceSayEvent * removed space formatting * changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb * changed prefix damage-force-say-numb to 5 (whoops) * Automatic changelog update * Update submodule to 241.0.0 (#34678) * Add puddle drawdepth (#32369) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Revert "Fix match box" (#34681) Revert "Fix match box (#34632)" This reverts commit |
||
|
ArtisticRoomba
|
98c606d760 |
Engineering guidebook megaupdate v2 (#33062)
Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information. Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read. |
||
|
Ed
|
f298396fe4 |
Upstream sync (#786)
* Box Station - Dechristmassified (#34135)
* dechrismassified
* removed camera from shower
* Marathon Station - Dechristmassified (#34136)
* dechristmassified
* further dechristmassified
* Loop Station Decal and maints additions (#34103)
* many changes
* contentingregrationtests
* serialized invalid removed
* blank
* "Changes and fixes as suggested"
* blank
* blank
* added desk bells
* engi rework rework rework
* added gate to content integration
* tweaks
* aaa
* bbb
* added holopads
* ccc
* Update default.yml
* hotfix
* aaa
* bbb
* many many tweaks and fixes
* aaa
* decals and maints
* aaa
* bbb
* ccc
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
* Rename cryobed yml file (#34134)
renamed cryopod.yml to cryogenic_sleep_unit.yml
* Cog update (not very merry) (#34144)
removed christmas merry
* bagel update (#34145)
* Add hair pulato (#34117)
* add sprite pulato
* update
* add pulato hair
* add pulato hair
* add pulato hair
* update meta "pulato"
* Automatic changelog update
* Holopad UI tweak for incoming calls (#34137)
* Initial commit
* Update
* Comment correction
* Minor margin increase
* Holopads no longer log broadcasted speech and emotes in the chat (#34114)
Initial commit
* Automatic changelog update
* Fixes borgs not being able to check their laws in crit (#34133)
* fix
* fix2
* Add contraband parent to laser gun safe (#34132)
* Automatic changelog update
* Add Holopad Circuit Board to A/V Communication Technology (#34150)
Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe.
* Automatic changelog update
* Fix disposal signal routers sprites (#34139)
* Fix disposal signal routers sprites
* Remove old shitcode
* Automatic changelog update
* Meta station overhaul (#33506)
* added mail, moved some things around, and fixed a lot of APCs
* fixed my mistakes
* Fixed a few mistakes and AI camera names
* Redid south medbay and more wiring
* Finished sci overhaul, and fixed all issues that I could find.
* rebuilt botany, removed vox box, fixed all known issues.
* Overhauled security
* Minor commit as I prepare to update my copy
* Rebalanced role counts
* Final changes, ready for review!
* Emisse and other people fixed issues with the station
* Finalized changes (for real this time)!
* Standardize shotgun ammo in storagefills (#34156)
shotgun ammo changes
* Automatic changelog update
* meta update (#34158)
* Amber Station Adjustments (#34126)
* Made a couple fixes to various decals, cleaned up some entities, gave the clown their bag and the bartender a handlabeler
* Several changes, more cameras, lighting fixes, adjusted hydro a bit, gave sec a bunch of shutters
* Added new random spawners for science and added them to Amber
* fixed the science spawners and modified amber slightly
* Fixed the random instrument entry
* Fix friendly vent spiders (#34153)
Swapped order of parents for MobGiantSpiderAngry
* Removed UseDelay component from RCD (#34149)
* Automatic changelog update
* Decrease hp for rusted walls (#34043)
* Automatic changelog update
* FIX: Thief beacon doubled steal targets (#33750)
* Automatic changelog update
* remove nukemass song (#34066)
* Automatic changelog update
* Corrected all ghost role names to title case. (#34155)
* Corrected all ghost role names to title case.
* Removes full stop from Hamlet's title.
* Updated ghost role names not in the main ghost roles .ftl
* Two capitals corrections
* Packed Update (Remove Christmas & New Evac) (#34168)
* Packed update (remove christmas, new shuttle)
* Fix invalid
* the voices
* Omega Update (Remove Christmas) (#34174)
omega soap
* Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.
* Fixing some missed references
* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).
* Corrected description back to "Irish Cream"
* Removed non-entities from migration.yml
* Automatic changelog update
* Bugfix for the AI player's eye getting stuck when their broadcast is interrupted (#34093)
Initial commit
* Speech is relayed by holopad holograms (#33978)
* Initial commit
* Corrected a field attribute
* Make JPEG a PNG (#34176)
Make 3.png a PNG
* Removed Undesirable Ion Storm Verbs (#34175)
* Remove Undesirable Laws
* empty
* added basic admin logs for PDA notekeeper notes (#34118)
* added basic admin logs for PDA notekeeper notes
* formatting
* added new LogType 'PdaInteract' and changed PDA notekeeper logs to it
---------
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
* Automatic changelog update
* Sprites defined for all non-generic computer boards. Added new syndicate computer board sprite. (#34104)
* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.
* Added new sprite to meta.json and updated attribution.
* Reformatted module.rsi meta.json to match other meta file styles.
* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.
* Corrected indentation spacing for currently edited entities.
* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
* add pr link to attribution
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
* Added pricegun sound (#34119)
added pricegun sound
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
* Automatic changelog update
* Separate Tables n' Counters (#32673)
* Update tables.yml
* Remove Extra base: state_
* Update tables.yml
* Automatic changelog update
* Add Chameleon PDA (#30514)
* V1 commit
* Remove PDA name and unnecessary pda state
* Adds PDA to Chameleon backpack & thief toolbox
* Change to use AppearanceDataInit
* Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied
* Revert PDA name (this will be changed to another way later)
* Update PDA name updating to new system
* Fix yaml, and fix Agent ID chameleon
* Updated based on review
* Automatic changelog update
* Add some ion storm actions to replace removed ones (#34180)
* Add some ion storm actions to replace removed ones
* Remove other country references, replace
* Some more tuning of the storm values, removing real-world countries
* boldy basics
* Automatic changelog update
* Amber Station and Science Spawner Tweaks (#34187)
* Modified science spawners a bit since I realized including maints loot was undesireable
* Linked Medical doors to buttons, redesigned the floor of the dining area a bit, placed more science spawners
* Somehow I overlooked that I was importing the maints loot table instead of the sci loot table
* Gave sci an EOD closet
* named the evac shuttle
* Core update (#34201)
add
* Elkridge Depot (The station formerly known as Cell) (#34085)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs
* updated PostMapInitTest.cs to include Cell
* added psychologist spawn
* fixed scanner console link, fixed disposals conveyors, and more
* added janitor service lights, maints firelocks, and more
* added more fun maint rooms
* improved head offices, kitchen, psych. added maints between science and arrivals
* fixed spawners placed over solid objects
* added unique evac shuttle, the Cilium
* evac shuttle is now orientated correctly
* added unique cargo shuttle
* updated kitchen area
* renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel
* general last-minute touch-ups around the bridge and sec
* changed station name in PostMapInitTest.cs
* Add Elkridge Depot into Map Rotation (#34206)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs
* updated PostMapInitTest.cs to include Cell
* added psychologist spawn
* fixed scanner console link, fixed disposals conveyors, and more
* added janitor service lights, maints firelocks, and more
* added more fun maint rooms
* improved head offices, kitchen, psych. added maints between science and arrivals
* fixed spawners placed over solid objects
* added unique evac shuttle, the Cilium
* evac shuttle is now orientated correctly
* added unique cargo shuttle
* updated kitchen area
* renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel
* general last-minute touch-ups around the bridge and sec
* changed station name in PostMapInitTest.cs
* added Elkridge to default map pool
* added myself to map_attribution.yml credits
* Automatic changelog update
* Packed Update (#34208)
Packed Update (decals mostly)
* Apply forensics when loading with an ammo box (#32280)
* Automatic changelog update
* Update Credits (#34220)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Fix rainbow lizard plushie inhands (#34128)
* fix rainbow plushie inhands
* address requested changes
* attribute sprites
* wielding refactor/fixes (#32188)
* refactor wieldable events
* fix inconsitency with wielding and use updated events
* wieldable cosmetic refactoring
* Update Content.Shared/Wieldable/Events.cs
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
* real
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* Automatic changelog update
* Lobby chat width and custom lobby titles (#33783)
* lobby name cvar
* panel width
* skrek
* server name localization fix
* comment format fix
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* remove redundant newline
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* string.empty
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* use SetWidth
* Update Resources/Locale/en-US/lobby/lobby-gui.ftl
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Adds bullet collision to station lights (#34070)
Adds collision with bullets to lights
* Automatic changelog update
* Oasis Update (#34245)
santa is keel.
* Amber Station - Minor Fixes (#34246)
* Moved the stand clear decal in front of the janitor's shutters up two pixels
* added tech maints under most maints doors, fixed power issues in cargo, and fixed a couple minor issues
* Make station anchor hitbox less insufferable (#34217)
* Automatic changelog update
* Remove kessler and zombeteors gamemodes from the secret pool (#34051)
* Remove kessler, zombeteors gameodes
* Probably should keep the protos in case an admin wants to torture players secretly
* address slart review
* Automatic changelog update
* Added distinct ad and bye chatter to Dr. Gibb vending (#34182)
* Added distinct ad and bye chatter to Dr. Gibb vending
* Correcting revert mistake
* Changed ad pack names to better match naming convention
* Implement approved rule changes (#34233)
* Special reagents now appear in the guidebook (#34265)
* Special reagents now appear in the guidebook
* Improved guidebook wording for reagent category
* Automatic changelog update
* Implement approved rule changes (#34233)
* Fix compilation errors in tests from update (#34272)
Required for https://github.com/space-wizards/RobustToolbox/pull/5590 to not cause compile fails, but can be merged on its own
* Fix portable scrubber appearing powered on spawn (#34274)
* [HOTFIX] Fix chameleon PDAs renaming IDs (#34249)
Fix chameleon PDA
* [HOTFIX] Fix Meta station power (#34256)
* hotfix meta power
* fixed AME
* add missing cargo shuttle pilot console to cargo
* Update vessel_warning.ogg (#34263)
* Update vessel_warning.ogg
Remove DC offset and apply short fade out.
* Update attributions.yml
* Update attributions.yml
* Add bleating accent to goats (#34273)
* Automatic changelog update
* Happy New Year (#34288)
happy new year
* Amber Station - Balance Improvements (#34294)
changed the center area in med bay to a garden, weakened meteor shielding in some areas, also general touch ups around the station
* Fixed Loop Station's southern solar array unlinked airlocks (#34296)
Fixed Southern solar external airlock door bolts
* Fix empty lines in adminwho with stealthmins. (#34122)
Don't print newline if admin is hidden.
* Automatic changelog update
* Added missing cameras to Loop Station (#34308)
* Added missing cameras
* Added missing cameras
* Amber Station - Fixes and Warm Lights (#34324)
* Added warm lights, placed them around the map, also fixed an issue with the MV wire in the cafeteria
* Fixed lv wiring in caf, and adjusted a couple things
* Empty commit to force checks to rerun
* Automatic changelog update
* change locking to use ComplexInteraction (#34326)
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Drink titles and soda vendor consistency (#34178)
* Made capitalisation of proper names consistent.
* Roy Rogers is presumably a proper name.
* Second pass at distinguishing proper names only.
* Two nitpicking/minor changes
* Fixed some overlooked can brand names. Matched case with descriptions.
* Switched generic sodas with brands for SodaInventory
* Removed commonly available branded cans
* Matched case consistency used elsewhere. Minor SPAG corrections.
* Added "nothing" and some missing alcohol bottles to RandomSpawner
* Added distinct ad and bye chatter to Dr. Gibb machines.
* Revert "Added distinct ad and bye chatter to Dr. Gibb machines."
This reverts commit f90b8a470556de05aca81255db8b6b03596ae944.
* Revert "Removed commonly available branded cans"
This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a.
* Revert "Switched generic sodas with brands for SodaInventory"
This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3.
* Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol.
* Renamed energy drink to Red Bool. Corrected and added some jug descriptions.
* Added reagent names for all bottles except poison-wine
* Revision of title case for cocktails
* SPAG and fixed the only brand reagen with unbranded name.
* Possibly controversial, shortened some bran names to better fit the UI.
* Fixed some inconsistencies in naming
* Matched brand localisation change
* Two name style edits
* Fixed Smite bottle name
* Minor, punctuation
* Blank line to end of file
* Upgraded descriptive names to title case
* Banana Mama
* reverts change, moved to another PR to avoid conflict.
* Removed caffeine reference.
* Minor, corrected some more inconsistencies
* Removed Bottle of Nothing from random spawner.
* Automatic changelog update
* Fix access configurator debug assert (#34330)
* fix
* greytide fix
* fix admin log
* Dirty
* Renamed water melon juice to watermelon juice (#34341)
* Fix battery charging stopping just short of being full (#34028)
* Add copy threshold button to air alarms (#34346)
* Automatic changelog update
* Oasis updoot the dimmining (#34347)
updooty
* Fland Station - Dirt Fix (#34352)
Fland
* Omega Station - Dirt Fix (#34353)
omega
* Marathon Station - Dirt Fix (#34354)
* Marathon
* Rerunning tests
* Cog Station - Dirt Fix (#34355)
Cog
* Box Station - Dirt Fix (#34356)
Box
* Bagel Station - Dirt Fix (#34357)
Bagel
* Packed Station - Dirt Fix (#34351)
* packed
* Rerunning tests
* Replace some sound PlayEntity with PlayPvs (#34317)
* Fixed Forensic Gloves to be Security Contraband (#34193)
* added BaseRestrictedContraband to forensic gloves
* moved from id to parent
* Automatic changelog update
* add large instruments to the cargo request computer (#34240)
* added the church organ to the cargo console (will add more in this PR, assuming i did this right (HOW DO YOU BUY CARGO ORDERS IN DEV ENVIROMENT???? *sobs))
* added other structure instruments to cargo Catalog
* fixed an epic copy/paste fail
* changed prices
* fixed epic copy/paste fail #2
---------
Co-authored-by: TeenSarlacc <baddiepro123@gmail.com>
* Automatic changelog update
* Fix crayon losing durability on stamped paper (#34202)
* Automatic changelog update
* Adds a border to Oppenhopper poster (#34219)
* border
* Update meta.json
* Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Trim trailing newlines from examine messages (#33381)
* Trim trailing newlines from examine messages
* TrimTrailingNewlines -> TrimEnd
* Add a popup message when ghost Boo action does nothing (#34369)
* fix ghost_component.ftl locale grammar (#34372)
fix ghost component locale grammar
* Let ghosts sometimes make certain devices say creepy things (#34368)
* Add SpookySpeaker component/system
* Shuffle Boo action targets before trying to activate them
* Add SpookySpeaker to vending machines
* Fix chatcode eating messages starting with "..."
* Add SpookySpeaker to recycler
* Oops
* Decrease speak probability for vending machines
* Add spooky speaker to arcade machines
* Automatic changelog update
* Add directional escape pod sign (#34367)
* Make indestructible tiles not breakable by explosions (#34339)
* No more Ai Spacing
* Move guard into earlier guard statement
* Automatic changelog update
* Arachnid stomach organ yaml fix (#34298)
Arachnid stomach yaml fix
Arachnids had their stomach `updateInterval` set to 1.5, 50% slower than
normal. But this doesn't actually slow down the speed that the stomach
digests things, only the rate at which it updates to check if enough
time has passed. (See
|
||
|
Errant
|
0b1ed3ec7e | Fix battery charging stopping just short of being full (#34028) | ||
|
Ed
|
4173d96d83 |
Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.IntegrationTests/Tests/ResearchTest.cs # Resources/Prototypes/Entities/Objects/Decoration/flora.yml # Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml # Resources/Prototypes/Maps/Pools/default.yml |
||
|
BramvanZijp
|
ce9fc82382 |
Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)
* Rebalance HoS's Energy Shotgun * SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system. * Prevent recharge cooldown if 0 power is used. * Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges. * Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun. * Clean up the client ammo UI fix. * Update the self recharger component to comply with maintainer request. Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Remove code that was made redundant by a hotfix from another PR. * Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared. * Fix another internal issue * Code cleanup + fix the rapid recharge verb to remove pause. * cleanup --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
|
Ed
|
cd736e4fd4 |
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Shared/Lock/LockSystem.cs # Resources/Maps/oasis.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/audio.yml |
||
|
IProduceWidgets
|
a28adf4ae4 |
baby proof the terminal (#33281)
* baby proof the terminal * Make a couple exceptions for items that you might take with you. * alwayspoweredlights * Uncuttable cables since cablecomp is a snowflake construction system * chairs and vendors * rerun heisentests * rerun tests again |
||
|
Ed
|
ae3cbd6092 |
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Server/Temperature/Systems/TemperatureSystem.cs # Content.Shared/Localizations/ContentLocalizationManager.cs |
||
|
eoineoineoin
|
70b7747fdd |
Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users * Check access only on client, when constructing UI * Do TODO (Thanks, Robust 236.1) --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> |
||
|
Ed
|
0456d40bef |
Content pack (#444)
* cable sprite * steel plates * iron wall * vladimirs resprite * resprite cables * cable item * lv cable finish * round table * curtains! (need resprite) * plates + cucumbers * more procedural cooking * some tweaks * fix test * пипяу * finish * ah * l * pip * some cool * hide station ai * revert localization * Update crates.yml * Update crates.yml * red and blue curtains * Update crates.yml * Update crates.yml * fix cupboard * Update exp_tavern.yml * fix sliceable recursion |
||
|
Julian Giebel
|
417d3a87a2 |
Station Anchor (#26098)
* Work on abstracting out chargeup functionality/ui from grav gen * Work on station anchor * Finish implementing station anchors * uhh yeah * ok. * fix tests * whoops * Get the last extraneous yaml fail * PJB review * beast mode... ACTIVATE! --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> |
||
|
metalgearsloth
|
a89d4c750b |
Power stuff (#31314)
* Power stuff - Add shared IsPowered - Add shared ResolveApc - Move PowerChangedEvent to shared for now - Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it. * big update * boing |
||
|
Pieter-Jan Briers
|
797aebb161 |
Fix bugs resulting in quantum APC visual states (#29475)
There were TWO bugs here FIRST, APCs *did* update their visual state on initialization, but at that point the relevant power state hasn't been initialized yet, so it always returns a bogus result. There aren't guaranteed to be subsequent power updates that actually trigger the APC to update so this can get it stuck. Fixed by just deferring the on-init update to be after the first update tick, which is itself ordered to be after power update. SECOND: Once I fixed that, I ran into the issue that APCs created at *server startup* also fail to update, because the throttling system (to prevent frequent APC updates) thinks the LastChargeStateTime was at server startup. Fixed by making that variable nullable so it defaults to null. Also removed the useless datafields on the "last update" fields. These are all just used to cache and throttle updates, something that should not be persisted to a map file. |
||
|
ShadowCommander
|
e2bf127323 |
Move ApcPowerReceiverComponent Powered state to shared (#28206)
* Try syncing powered state to client For some reason the client is not receiving the ApcPowerReceiverComponentState, so it's not working. * Fix powered state not syncing to client The client PowerReceiverSystem was abstract, which prevented it from running initialize. * Flip check so that it runs bigger checks first PowerDisabled skips the others. NeedsPower skips the receiving check. * Disallow changing Powered manually * Move Powered update to PowerReceiverSystem * Move appearance to event subscription * Move metadata component to AllEntityQuery * Cleanup * Move Powered update back to PowerNetSystem It's easier to use the EntityQueries and it dosen't need to be updated anywhere else. * Put appearance updating back * Move IsPowered to shared * Simplify IsPowered * Cleanup * Remove duplicate PowerChangedEvent PowerChangedEvent on ProviderChanged doesn't seem to be needed PowerChangedEvent gets raised by in update if the power state changes after a new provider is connected |
||
|
Kara
|
1596e04d0f |
Resolve all non-obsoleting warnings in content (#27934)
* Resolve all non-obsoleting warnings in content * Update ClientGameTicker.cs * Update SkeletonAccentSystem.cs * Update BwoinkSystem.cs |
||
|
icekot8
|
a7ad59f6ba |
Portable Recharger: Arsenal T3 (#26655)
* sys * item * ahm. * Update Content.Server/Power/Components/ChargerComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
|
metalgearsloth
|
5896e68752 |
Content update for UI prediction (#27214)
* Content update for UI refactor * Big update * Sharing * Remaining content updates * First big update * Prototype updates * AUGH * Fix UI comp ref * Cleanup - Fix predicted message, fix item slots, fix interaction range check. * Fix regressions * Make this predictive idk why it wasn't. * Fix slime merge * Merge conflict * Fix merge |
||
|
Leon Friedrich
|
888a3bda51 |
Atmos device performance improvements (#26493)
* Atmos device performance improvements * AtmosDirection perf improvements * Fix errors * Add GasTileOverlayComponent arguments * Make excite no longer invalidate a tile |
||
|
Tayrtahn
|
2935e5bd78 |
Remove all obsolete BatteryComponent method calls (#25871)
Removed all obsolete, non-ECS method calls to BatteryComponent |
||
|
Nemanja
|
a9e89ab372 |
Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades * eek |
||
|
Nemanja
|
c861b66a47 |
Turbo Recharger (#23723)
turbo charger |
||
|
chromiumboy
|
1de682e23f |
Power monitoring console overhaul (#20927)
* Prototyping whole station wire map * More prototyping * Added icons for the different power distributors and toggleable cable displays * Power cable layouts are now only sent to the client when the power monitor is open * UI prototyping * Power monitors can now see the sprites of distant entities, long entity names are truncated * Updated how network devices are added to the player's PVS * More feature prototypes * Added source / load symbols * Final prototype! Time to actually code it properly... * Start of code clean up * Continuing code clean up * Fixed UI appearance * Code clean up complete * Removed unnecessary changes * Updated how power values are calculated, added UI warnings for power sinks and power net checks * Updated how power values are calculated again, added support for portable generators * Removed unnecessary files * Map beacons start toggled off, console map now works outside the station, fixed substation icon * Made some of Sloth's requested changes. Power distributors don't blink anymore, unless selected * Moved a number of static variables in PowerMonitoringHelper to sensible places in the main files. Added a NavMapTrackableComponent so that you can specify how individual entities appear on the navmap * Updated the colors/positions of HV cables and SMESes to improve contrast * Fixed SMES color in map legend * Partially fixed auto-scrolling on device selection, made sublists alphabetical * Changed how auto-scroll is handled * Changed the font color of the console warning messages * Reduced the font size of beacon labels * Added the station name to the console * Organized references * Removed unwanted changes to RobustToolbox * Fix merge conflict * Fix merge conflict, maybe * Fix merge conflict * Updated outdated reference * Fixed portable_generator.yml * Implemented a number of requested changes, move bit masks to a shared component * Navigate listings via the navmap * First attempt at improving efficiency * Second attempt at optimization, entity grouping added for solar panels * Finished solar panel entity joining * Finished major revisions, code clean up needed * Finializing optimizations * Made requested changes * Bug fix, removed obsolete code * Bug fixes * Bug fixes * STarted revisions * Further revisions * More revision * Finalizing revisions. Need to make RT PR * Code tidying * More code tidying * Trying to avoid merge conflicts * Trying to avoid merge conflicts * Removed use of PVS * Improving efficiency * Addressed a bunch of outstanding issues * Clear old data on console refresh * UI adjustments * Made node comparison more robust. More devices can be combined into one entry * Added missing component 'dirty' |
||
|
DrSmugleaf
|
a136616531 | Replace Component.OnRemove with ComponentRemove event subscriptions (#21072) | ||
|
chromiumboy
|
535b013f63 |
SMES and substation require power cells as machine parts (#20344)
* Initial commit * Balancing and tweaks |
||
|
Leon Friedrich
|
86fa8ae180 | Remove IoC resolves in BaseNetConnectorNodeGroup and friends (#20333) | ||
|
deltanedas
|
f2669b5771 |
Clean up APCs (#19841)
While here, fix an issue where APCs don't update the UI state after a load change. |
||
|
Leon Friedrich
|
e4ca6f4fb9 | Allow solutions to store extra reagent data (#19323) | ||
|
metalgearsloth
|
279674c0b3 | Revert "Make lights dim under low power" (#19708) | ||
|
Pieter-Jan Briers
|
bf16698efa | Portable Generator Rework (#19302) | ||
|
DrSmugleaf
|
35107f7c2b | Fix component generic usages where IComponent would not be valid (#19482) | ||
|
Kevin Zheng
|
f8bdfd6d26 |
Make lights dim under low power (#19317)
* Make lights dim under low power * Slightly more dramatic curve |
||
|
DrSmugleaf
|
a88e747a0b | Refactor serialization copying to use source generators (#19412) | ||
|
Nemanja
|
b8250f9601 | entity storage tweaks (#19182) |