feat: Менеджер для привязки игрового профиля к дискорду #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SantaGitHub
changed the title
…соба определения нужного игрока(только сервер будет знать какой правильный Id игрока). Нельзя будет UserName подменять
SantaGitHub
changed the title
Redict
reviewed
May 11, 2023
|
Пока не сливай, т.к. надо дописать какую команду нужно будет в дискорде использовать |
Redict
reviewed
May 12, 2023
TheArturZh
added a commit
to TheArturZh/space-station-14
that referenced
this pull request
Jul 12, 2023
TheArturZh
pushed a commit
to TheArturZh/space-station-14
that referenced
this pull request
Feb 17, 2024
…bles" (space-wizards#25201) Revert "Allow configuring gen_build_info.py through environment variables (SerbiaStrong-220#2…" This reverts commit 163e6d2.
stalengd
pushed a commit
to stalengd/space-station-14
that referenced
this pull request
Jul 26, 2024
Irremovable Items
stalengd
pushed a commit
to stalengd/space-station-14
that referenced
this pull request
Jan 18, 2025
) * 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 SerbiaStrong-220#2 --------- Co-authored-by: TeenSarlacc <baddiepro123@gmail.com>
Kirus59
pushed a commit
that referenced
this pull request
Jan 20, 2025
* Automatic changelog update * Add Holopad Circuit Board to A/V Communication Technology (space-wizards#34150) Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe. * Automatic changelog update * Fix disposal signal routers sprites (space-wizards#34139) * Fix disposal signal routers sprites * Remove old shitcode * Automatic changelog update * Meta station overhaul (space-wizards#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 (space-wizards#34156) shotgun ammo changes * Automatic changelog update * meta update (space-wizards#34158) * Amber Station Adjustments (space-wizards#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 (space-wizards#34153) Swapped order of parents for MobGiantSpiderAngry * Removed UseDelay component from RCD (space-wizards#34149) * Automatic changelog update * Decrease hp for rusted walls (space-wizards#34043) * Automatic changelog update * FIX: Thief beacon doubled steal targets (space-wizards#33750) * Automatic changelog update * remove nukemass song (space-wizards#34066) * Automatic changelog update * Corrected all ghost role names to title case. (space-wizards#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) (space-wizards#34168) * Packed update (remove christmas, new shuttle) * Fix invalid * the voices * Omega Update (Remove Christmas) (space-wizards#34174) omega soap * Renamed "Irish Car Bomb" drink to "Irish Slammer" (space-wizards#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 (space-wizards#34093) Initial commit * Speech is relayed by holopad holograms (space-wizards#33978) * Initial commit * Corrected a field attribute * Make JPEG a PNG (space-wizards#34176) Make 3.png a PNG * Removed Undesirable Ion Storm Verbs (space-wizards#34175) * Remove Undesirable Laws * empty * added basic admin logs for PDA notekeeper notes (space-wizards#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. (space-wizards#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 (space-wizards#34119) added pricegun sound Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk> * Automatic changelog update * Separate Tables n' Counters (space-wizards#32673) * Update tables.yml * Remove Extra base: state_ * Update tables.yml * Automatic changelog update * Add Chameleon PDA (space-wizards#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 (space-wizards#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 (space-wizards#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 (space-wizards#34201) add * Elkridge Depot (The station formerly known as Cell) (space-wizards#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 (space-wizards#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 (space-wizards#34208) Packed Update (decals mostly) * Apply forensics when loading with an ammo box (space-wizards#32280) * Automatic changelog update * Update Credits (space-wizards#34220) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fix rainbow lizard plushie inhands (space-wizards#34128) * fix rainbow plushie inhands * address requested changes * attribute sprites * wielding refactor/fixes (space-wizards#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 (space-wizards#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 (space-wizards#34070) Adds collision with bullets to lights * Automatic changelog update * Oasis Update (space-wizards#34245) santa is keel. * Amber Station - Minor Fixes (space-wizards#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 (space-wizards#34217) * Automatic changelog update * Remove kessler and zombeteors gamemodes from the secret pool (space-wizards#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 (space-wizards#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 (space-wizards#34233) * Special reagents now appear in the guidebook (space-wizards#34265) * Special reagents now appear in the guidebook * Improved guidebook wording for reagent category * Automatic changelog update * Implement approved rule changes (space-wizards#34233) * Fix compilation errors in tests from update (space-wizards#34272) Required for space-wizards/RobustToolbox#5590 to not cause compile fails, but can be merged on its own * Fix portable scrubber appearing powered on spawn (space-wizards#34274) * [HOTFIX] Fix chameleon PDAs renaming IDs (space-wizards#34249) Fix chameleon PDA * [HOTFIX] Fix Meta station power (space-wizards#34256) * hotfix meta power * fixed AME * add missing cargo shuttle pilot console to cargo * Update vessel_warning.ogg (space-wizards#34263) * Update vessel_warning.ogg Remove DC offset and apply short fade out. * Update attributions.yml * Update attributions.yml * Add bleating accent to goats (space-wizards#34273) * Automatic changelog update * Happy New Year (space-wizards#34288) happy new year * Amber Station - Balance Improvements (space-wizards#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 (space-wizards#34296) Fixed Southern solar external airlock door bolts * Fix empty lines in adminwho with stealthmins. (space-wizards#34122) Don't print newline if admin is hidden. * Automatic changelog update * Added missing cameras to Loop Station (space-wizards#34308) * Added missing cameras * Added missing cameras * Amber Station - Fixes and Warm Lights (space-wizards#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 (space-wizards#34326) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Drink titles and soda vendor consistency (space-wizards#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 f90b8a4. * Revert "Removed commonly available branded cans" This reverts commit 43b8216. * Revert "Switched generic sodas with brands for SodaInventory" This reverts commit f1790f0. * 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 (space-wizards#34330) * fix * greytide fix * fix admin log * Dirty * Renamed water melon juice to watermelon juice (space-wizards#34341) * Fix battery charging stopping just short of being full (space-wizards#34028) * Add copy threshold button to air alarms (space-wizards#34346) * Automatic changelog update * Oasis updoot the dimmining (space-wizards#34347) updooty * Fland Station - Dirt Fix (space-wizards#34352) Fland * Omega Station - Dirt Fix (space-wizards#34353) omega * Marathon Station - Dirt Fix (space-wizards#34354) * Marathon * Rerunning tests * Cog Station - Dirt Fix (space-wizards#34355) Cog * Box Station - Dirt Fix (space-wizards#34356) Box * Bagel Station - Dirt Fix (space-wizards#34357) Bagel * Packed Station - Dirt Fix (space-wizards#34351) * packed * Rerunning tests * Replace some sound PlayEntity with PlayPvs (space-wizards#34317) * Fixed Forensic Gloves to be Security Contraband (space-wizards#34193) * added BaseRestrictedContraband to forensic gloves * moved from id to parent * Automatic changelog update * add large instruments to the cargo request computer (space-wizards#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 (space-wizards#34202) * Automatic changelog update * Adds a border to Oppenhopper poster (space-wizards#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 (space-wizards#33381) * Trim trailing newlines from examine messages * TrimTrailingNewlines -> TrimEnd * Add a popup message when ghost Boo action does nothing (space-wizards#34369) * fix ghost_component.ftl locale grammar (space-wizards#34372) fix ghost component locale grammar * Let ghosts sometimes make certain devices say creepy things (space-wizards#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 (space-wizards#34367) * Make indestructible tiles not breakable by explosions (space-wizards#34339) * No more Ai Spacing * Move guard into earlier guard statement * Automatic changelog update * Arachnid stomach organ yaml fix (space-wizards#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 https://github.com/space-wizards/space-station-14/blob/23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4/Content.Server/Body/Systems/StomachSystem.cs#L57 ) This PR changes arachnid stomachs to have a `digestionDelay` of 30 (20 is default) to achive the desired effect. Stasis beds are also bugged in a similar manner. They are intended to slow down the digestion speed, but similarly all they do is change the update rate. But fixing that requires actual code changes and is out of scope for this commit. * Automatic changelog update * Bended radiator (space-wizards#34251) * Automatic changelog update * Remove Entity<T> data-fields (space-wizards#34083) * Update submodule, .NET 9 (space-wizards#34320) * Role Types (space-wizards#33420) * mindcomponent namespace * wip MindRole stuff * admin player tab * mindroletype comment * mindRolePrototype redesign * broken param * wip RoleType implementation * basic role type switching for antags * traitor fix * fix AdminPanel update * the renameningTM * cleanup * feature uncreeping * roletypes on mind roles * update MindComponent.RoleType when MindRoles change * ghostrole configuration * ghostrole config improvements * live update of roleType on the character window * logging stuff and notes * remove thing no one asked for * weh * Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * move roletypeprototype to its own file, minor note stuff * remove Roletype.Created * log stuff * roletype setup for ghostroles and autotraitor reinforcements * ghostrole type configs * adjustable admin overlay * cleanup * fix this in its own PR * silicon antagonist * borg stuff * mmi roletype handling * spawnable borg roletype handling * weh * ghost role cleanup * weh * RoleEvent update * polish * log stuff * admin overlay config * ghostrolecomponent cleanup * weh * admin overlay code cleanup * minor cleanup * Obsolete MindRoleAddedEvent * comment * minor code cleanup * MindOnDoGreeting fix * Role update message * fix duplicate job greeting for cyborgs * fix emag job message dupe * nicer-looking role type update * crew aligned * syndicate assault borg role fix * fix test fail * fix a merge mistake * fix LoneOp role type * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Roles/SharedRoleSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * comment formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * change logging category Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix a space Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use MindAddRoles Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * get MindComponent from TryGetMind Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * move var declaration outside loop * remove TryComp * take RoleEnum behind the barn * don't use ensurecomp unnecessarily * cvar comments * toggleableghostrolecomponent documentation * skrek * use EntProtoId * mindrole config * merge baserolecomponent into basemindrolecomponent * ai and borg silicon role tweaks * formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * I will end you (the color) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use LocId type for a locale id * update RoleEvent documentation * update RoleEvent documentation * remove obsolete MindRoleAddedEvent * refine MindRolesUpdate() * use dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * inject dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * roleType.Name no longer required * reformatted draw code logic * GhostRoleMarkerRoleComponent comment * minor SharedRoleSystem cleanup * StartingMindRoleComponent, unhardcode roundstart silicon * Update Content.Shared/Roles/SharedRoleSystem.cs * remove a whitespace --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Update Credits (space-wizards#34389) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Elkridge Depot Improvements (space-wizards#34377) * updates decals * more decal work, more dinginess in certain areas * added decals under doors * Fix force-feeding Loc strings not using target's gender (space-wizards#34276) * HOTFIX Tweaked air alarm default settings for nitrogen breathing crew (space-wizards#34198) air alarm default settings modified for anaerobic crew * space-wizards#33571 Bomb defusal lockers always should have tools (space-wizards#34394) * Automatic changelog update * [HOTFIX] fix holopads with multiple ai cores dying (space-wizards#34289) change return to continue Co-authored-by: deltanedas <@deltanedas:kde.org> * Reduce Panic Bunker Minimum Playtime to 2 hours (space-wizards#34401) * Add IPIntel API support. (space-wizards#33339) Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com> * Automatic changelog update * Fland Reporters Room (space-wizards#34408) changed the command checkpoint to a reporters room. * Automatic changelog update * Add a high-capacity water tank to the janitor's closet of Oasis (space-wizards#34366) added high capacity water tank * Darkened Service job interface icons for better contrast (space-wizards#34270) * Darkened Service job interface icons for better contrast * Fixed Botanist job interface icon dark handle hole * Change to new, darker, service color in all resource yml files * Revert Map file service color changes * Use new darker service color on id cards * Revert Service color change in mapping_actions.yml * Revert salvage difficulties service color * Redo service ID and job colors to match advanced palette * Revert all service color yml file changes * Switch icons to use existing service pallete colors from advanced pallete * Update meta.json for darkened service icons --------- Co-authored-by: Erskin Cherry <frobnic8@gmail.com> * Amber Station - Moved Vents Around (space-wizards#34410) * Moved all vents around, made some small changes * Finished work * Removed insuls spawner since they're not merged yet * Insuls Spawner (space-wizards#34407) * Added insuls spawner, time to test * adjusted whitespace since that was causing issues * Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Manual Valves Resprite (space-wizards#34378) * resprited manual valves to be colourblind friendly * Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Automatic changelog update * loop station door access fixes and air sink (space-wizards#34414) small fixes * Raise syndicate kobold reinforcement HP crit threshold from 75 to 100 to match monkey. (space-wizards#34409) kobold ops have 100 health * Anomaly dragging exploit fix and QOL changes (space-wizards#34280) * Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * APE dragging exploit fix * Fixed doors being blocked with mousetraps, and other Collidable items (space-wizards#34045) * Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes * Update Content.Shared/Doors/Systems/SharedDoorSystem.cs Clarifies comment of how the mask is used Co-authored-by: Centronias <charlie.t.santos@gmail.com> --------- Co-authored-by: Centronias <charlie.t.santos@gmail.com> * Fixed Jazz Instrument for Electric Guitars (space-wizards#33363) * fixed jazz midi program byte * swapped around jazz and clean in instrumentList * Automatic changelog update * Porting Pride-O-Mat to Upstream (space-wizards#34412) * Pride-O-Mat (#1322) * Added Pride-O-Mat * Yep * Updated license to the correct one * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory * Removed bunny ears, fixed typo * Made requested changes Webedit lmao --------- Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com> * Automatic changelog update * Oasis Power Rebalance + Misc fixes (space-wizards#34425) * balance oasis power as a stopgap * change waste color to proper waste color * Fix IPIntel causing frequent errors with the cleanup job. (space-wizards#34428) Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com> * craftable pet carrier (space-wizards#34431) * craftable pet carrier * epic integration test fail * Update Resources/Prototypes/Recipes/Crafting/improvised.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * extra tab begone * epic linter fail * how did linter not see this??? --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Adds omnisexual pin (space-wizards#34439) * Make important change (#7) This is to help julian test his bot * Omnibus * Remove random test file from testing a gh bot * Add pin to vendor, spawners and loadout --------- Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> * Fix bad Rider analysis error in AccessOverriderWindow.xaml.cs (space-wizards#34213) * Disable meta-atlas for big rare RSIs (space-wizards#33643) * Persist deadmin to database, add admin suspension system (space-wizards#34048) * Automatic changelog update * STAThread client content start (space-wizards#34212) * Minor client packaging changes (space-wizards#33787) * Fix muzzle accent (space-wizards#34419) * Automatic changelog update * Add Discord webhook on watchlist connection (space-wizards#33483) * Automatic changelog update * Fixed Thief starting gear failing on specific bag inventories. (space-wizards#34430) Fixed it yayyy * Added missing details from worn capes to head of department beadsheets (space-wizards#34396) * Added key and missing details from worn cape to HOP bedsheet * Corrected canvas size for sprite * Subtle tweak to shading to reduce color blurring at pillow edge * Matched Hue and tone to cape * Tweak chekered pattern marks for gold trim * Removed accidental palette inclusion * Clearer wording and corrected attribution name. * Tweaked shading on key image to fit in better with bed aesthetics * Added CE cape icon to bedsheet * Added cape image to HOP bedsheet. Made gold trim better match cape visuals * RD cape icon added. Colour tweaked to better match cape. * Updates json * Tweaks to gold trim shading to match bed aesthetics * Added better shading for HOP sheet side. Halved file size. * Optimised HOS RD and CE sheet sprites * Corrected sprite title in attribution * Replace ERT Medic's Advanced Medkits with 2 Combat Medkits (space-wizards#34380) Replaced Adv kits with 2 combat kits * Fix nonsensical RegEx for name restriction (space-wizards#34375) * Fixed nonsense RegEx "-" character is a range, caused an error. No need for "," to repeat so much, it's not a separator. "\\" - just why? * Further optimized RegEx structure Added: "@" delimiter for consistency "/" to escape "-" for good and to avoid further problems * Remove the ability to print the station anchor circuit board (space-wizards#34358) remove the ability to print the station anchor circuit board * Automatic changelog update * Meta hotfix (space-wizards#34306) * Fixed major issues with power, cargo shuttle docking, etc. * remove serialized invalids * Finished fixing the critical issues, ready for merge? * Empty commit * Added new break room to sci (they deserve it) * Fixed up other minor issues * if this map isnt PERFECT Emisse has permission to gib me and turn me into a cyborg * added Roomba's changes --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Make Mime PDA interactions silent (space-wizards#34426) * make insert and eject datafields in ItemSlotsComponent.cs nullable, make mime PDA silent * make it so that you can't fit wirecutters into the slots, among other various things * Automatic changelog update * Smite vending machine (space-wizards#34420) * Added smite machine to YAML * Added smite ads and inventory * Added smite vendor sprites * Changed the description of the machine to not repeat and ad line. * Added newline to end of inventory .yml * Corrected erroneous edit. * Tweaked all sprites * Added tesla toy to contraband. Reduced number of drinks available * Reduced soda varieties but increased can numbers. * Removed tesla toy from contraband inventory * Removed speech component from vending machines that already inherit it * Moved Sprite component to top of list * Added Smite vendors to random spanwers * Alphabetised spawn prototypes, commented where name is unclear * Automatic changelog update * Printable bedsheets (space-wizards#34034) * Bedsheets * that one fixes yellow bedsheet and delete american bedsheet * Automatic changelog update * Update RT to v239.0.1 (space-wizards#34454) * Remove christmas anomaly spawn (space-wizards#34053) Update anomaly.yml * Automatic changelog update * Remove baby jail (space-wizards#34443) * Remove baby jail Closes space-wizards#33893 * Test fail fix. * Add a CCVar to allow from hiding admins in the reported player count. (space-wizards#34406) Good for: - Keeping admins hidden - Not confuse players seeing 84/80 players Nicely pairs up with the ``admin.admins_count_for_max_players`` ccvar * Automatic changelog update * Fix Mixed puddles not updating slips when evap (space-wizards#34303) * Fix Mixed puddles not updating slips when evap * Remove Comment that isn't needed Co-authored-by: Centronias <charlie.t.santos@gmail.com> * CR - use SolutionContainerSystem.UpdateChemicals * CR - cleanup unused imports --------- Co-authored-by: Centronias <charlie.t.santos@gmail.com> * Automatic changelog update * WizDen config update for IPIntel (space-wizards#34457) * Fix DNA scrambler updating station record (space-wizards#34091) * Fix DNA scrambler updating station record * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * New and Modified Map Spawners (space-wizards#34424) * Added spanwers and modified others * adjusted values to be more in line with what I want * this comment may have caused that test fail * oh my god another typo * Modified door crate to be engineering flavored * reduced the pride vendor odds Webedit lmao * Elkridge Depot Fixes Again (space-wizards#34461) fixes evac shuttle, fix north solars, fix vents and scrubbers * Space Ruins Variant (space-wizards#34445) * Space Ruins Variant * Updated File * Added Goliaths/Removed some mobs * Plasma Station (space-wizards#33991) * 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 --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * Plasma station population tweak (space-wizards#34462) * 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 --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * Automatic changelog update * Fix inconsistent borg flashlight state (space-wizards#33027) * Fix borg light being stuck on if no cell is inserted * Fix HandheldLightComponent.Activted becoming out of sync with SharedPointLightComponent.Enabled * Fix for entities which don't have a handheld light component * FIX: Uranium, Cak, and BreadDog are not garbage! (space-wizards#34192) * FIX: Uranium, Cak, and BreadDog are not garbage! * Fixed bread typo for spacegarbage change. * Style: moved ediblebase * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Fix the HoS mantle metashield break (space-wizards#33831) Changes 'nukies' to 'syndicate agents' in the HoS mantle's description. * fix for climbable pianos (space-wizards#33690) fix for climable pianos Co-authored-by: aa5g21 <aa5g21@soton.ac.uk> * Automatic changelog update * BorgChassis transfer their mind to a dropped BorgBrain fix (space-wizards#34464) Fix * Additional Ionstorm Law Updates (space-wizards#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. (space-wizards#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 (space-wizards#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 (space-wizards#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 (space-wizards#34480) * Automatic changelog update * Holopad networking rework (space-wizards#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 space-wizards#34488 * Optimize & clean up RadiationSystem (space-wizards#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 (space-wizards#34497) * Various Locale Typo Fixes (and spaces) (space-wizards#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 (space-wizards#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 (space-wizards#34500) * Automatic changelog update * Upstream merge 70 localization * Upstream merge 70: update robust toolbox * Upstream merge 70: Admin who fix * Upstream merge 70: Remove BaseRestrictedContraband * Upstream merge 70: SpriteFont fix * Upstream merge 70: Remove SS220 ahelp sounds option * Upstream merge 70: Do not serialize BurglarBugComponent.Door * Upstream merge 70: Wield fix * Upstream merge 70: AI factions fix * Upstream merge 70: Fix bad super matter string formatting * Upstream merge 70: Remove broken using * Upstream merge 70: Holopad fix * Upstream merge 70: Fix PostMapInitTest * Upstream merge 70: Fix PDA prototypes * Upstream merge 70: Fix PDA prototypes 2 * Upstream merge 70: Fix map renderer * Upstream merge 70: Fix PDA prototypes 3 * Upstream merge 70: Fix PDA prototypes 4 * Upstream merge 70: Fix PAI SS220 * Upstream merge 70: Fix Meta map lawyers * Upstream merge 70: Revert bagel * Upstream merge 70: No lawyers on elkringe * Upstream merge 70: No lawyers on plasma * Upstream merge 70: Fix PDA prototypes 5 --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: amatwiedle <amatwiedle@gmail.com> Co-authored-by: justdie12 <125140938+justdie12@users.noreply.github.com> Co-authored-by: Nox <nebulousnox38@gmail.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Co-authored-by: Booblesnoot42 <108703193+Booblesnoot42@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ReeZer2 <63300653+ReeZer2@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Co-authored-by: Spanky <scott@wearejacob.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: Dylan Hunter Whittingham <45404433+DylanWhittingham@users.noreply.github.com> Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Deerstop <edainturner@gmail.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Centronias <charlie.t.santos@gmail.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Pancake <Pangogie@users.noreply.github.com> Co-authored-by: Piras314 <p1r4s@proton.me> Co-authored-by: flymo5678 <86871317+flymo5678@users.noreply.github.com> Co-authored-by: c4llv07e <igor@c4llv07e.xyz> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Coolsurf6 <coolsurf24@yahoo.com.au> Co-authored-by: TeenSarlacc <46608342+TeenSarlacc@users.noreply.github.com> Co-authored-by: TeenSarlacc <baddiepro123@gmail.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: SpaceManiac <tad@platymuus.com> Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com> Co-authored-by: Zachary Higgs <compgeek223@gmail.com> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Floxington <florian.decker@mailbox.org> Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems> Co-authored-by: SlimSlam <73899110+Stewie523@users.noreply.github.com> Co-authored-by: frobnic8 <erskin@eldritch.org> Co-authored-by: Erskin Cherry <frobnic8@gmail.com> Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com> Co-authored-by: hyperDelegate <zachary1064@gmail.com> Co-authored-by: JustinWinningham <justinmwinningham@gmail.com> Co-authored-by: zHonys <69396539+zHonys@users.noreply.github.com> Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: Palladinium <patrick.chieppe@hotmail.com> Co-authored-by: Alpha-Two <92269094+Alpha-Two@users.noreply.github.com> Co-authored-by: Hyper B <137433177+HyperB1@users.noreply.github.com> Co-authored-by: kosticia <kosticia46@gmail.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: compilatron <40789662+jbox144@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Patrik Caes-Sayrs <heartofgoldfish@gmail.com> Co-authored-by: ApolloVector <149586366+ApolloVector@users.noreply.github.com> Co-authored-by: Gansu <68031780+GansuLalan@users.noreply.github.com> Co-authored-by: aa5g21 <aa5g21@soton.ac.uk> Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com> Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com> Co-authored-by: Minemoder5000 <minemoder50000@gmail.com> Co-authored-by: Tobias Berger <toby@tobot.dev> Co-authored-by: Partmedia <kevinz5000@gmail.com> Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Реализация привязки Дискорда к игре.
Локально проверял. В БД всё записывается
Как использовать: