Добавление ещё скрытого описания #2544
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Changes: No C#
lzk228
reviewed
Aug 31, 2024
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
Outdated
Show resolved
Hide resolved
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
морбо |
Vonsant
reviewed
Nov 18, 2024
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
Outdated
Show resolved
Hide resolved
Vonsant
requested changes
Nov 18, 2024
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
Outdated
Show resolved
Hide resolved
|
А чо по тулбоксу, его никто не может опознать? |
Думаю делать чтобы его мог опознать инженер или учёный, перебор. Это скорее чтобы сам предатель не потерялся, так как можно спутать с любым тулбоксом. |
Vonsant
approved these changes
Nov 22, 2024
AwareFoxy
added a commit
to space-syndicate/space-station-14-next
that referenced
this pull request
Nov 24, 2024
* Applying Fix from #32764 to staging * Fix random test fail in DeleteAllThenGhost (#32753) It's simple. We kill the heisentest * Fix random test fail in DeleteAllThenGhost (#32753) It's simple. We kill the heisentest * Fix some rounds failing to end due to mind roles (#32792) (#32793) * Fix some rounds failing to end due to mind roles Fixes #32791 This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo(). This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set. The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype. I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception. I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix. * At least one maintainer approved this tiny PR without reading it, not naming names. * HOTFIX: Fix tech anomaly nexttimer (#32805) (#32807) Fix tech anomaly nexttimer (#32805) Co-authored-by: metalgearsloth <[email protected]> * HOTFIX spider clan charges can be armed again (#32866) * fix ninja bomb component check * remove TryGetRole * HOTFIX Plushies no longer delete items when recycled (#32882) Fix: Plushies no longer delete items when recycled (#32838) fix Co-authored-by: beck-thompson <[email protected]> * HOTFIX (stable) submodule update (#32900) Update submodule This fixes an important memory leak. * Hotfix server config changes for playercap and Levi bunker (#32925) Co-authored-by: slarticodefast <[email protected]> * Applying Fix from #32764 to staging * Fix Bug With Uppercase Radio Keys (#32997) * Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system. * Fix playtime formatting (#32974) * Fixes tailthump breaking positional audio by making it mono (#33092) * Hotfix add debug info to traitor activation (#33119) * Add debug messages to traitor activation * more debug * we hate powergaming * HOTFIX latejoin traitor activations (#33180) * Reverted #31978 * oops reverted too much * dark green jumpsuit recolor, casual green jumpsuits added (#31710) * green * fix material arbitrage * lighter * Automatic changelog update * Label workflow - stable (#33220) * Label workflow - staging (#33221) * Add a Walking alert (#32954) * Initial commit * Review feedback changes * ProtoId * TempCommit * First attempt to have client alerts * Review changes * The Jumpsuit Re-Detailening (#33096) * jumpsuit detailening * jumpskirt stuff * meta.json * update meta.json * meta.json fix fix * meta.json fix fix fix * Intellicards now have a doAfter. (#33198) * init * cleanup * Oops! Forgot something * addressing changes * guh * guh 2.0 * some cleanup * all bless the intellicard * Yippee * small locale thing * changes + small bugfix --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Update Credits (#33237) Co-authored-by: PJBot <[email protected]> * Removed bola stam damage (#32989) * tweak: weather command tooltip (#33130) clear weather tip * Automatic changelog update * Goliath rebalance (#31492) Update asteroid.yml * Omega Station: Fix Air Alarm in CMO office (#33216) move air alarm and link devices * [Maps] Astra Update (space-syndicate#2760) * Automatic changelog update * Фикс законов боргов. (space-syndicate#2754) * Automatic changelog update * Resprite some captain clothing (space-syndicate#2740) * Automatic changelog update * Fix vape use without check if doafter cancelled (#33245) vape small fix * HOTFIX: Fix Security Shell Gun being uncraftable. (#33247) * Sec Shell Gun Craftability Hotfix * Capital Fix * New lobby art (space-syndicate#2762) * Automatic changelog update * Make the Flare Gun & Security Shell Gun be unbolted by default. (#33248) * Automatic changelog update * Remove roundStart: false for Anivia voice prototype (space-syndicate#2764) * Zombies able to see infection. * BUGFIX: Fix APEs being able to be turned on without power (#32493) Add a check to see the APC is powered before turning the emitter on. * Automatic changelog update * Separate CCVars into separate files * improve BiomeDunGen (#33113) * improve BiomeDunGen * forgot lol * Update DungeonJob.PostGenBiome.cs * Update DungeonJob.PostGenBiome.cs * Make Droppers Respect Closed/Sealed Containers (#33011) * Make droppers respect closed/sealed * Combine nested * Optimize conditions a bit * Automatic changelog update * Allow editing angle of the fired projectile (#33254) Add Angle datafield to `ProjectileComponent`. It allows to change the angle of the fired projectile * Fix unban/editing role bans placed in groups. (#30659) * On editing a roleban, get all the bans with the same time. * forgoten newline * Update to check for player ID too. * Automatic changelog update * [Maps] Paper Tweak (space-syndicate#2761) * Automatic changelog update * Adds new sprites for shotgun shell boxes (#33176) * Adds new sprites for shotgun shell boxes * Adds second set of mag visuals for slug and uranium casings * Fixes yaml that I messed up * Changes credit to new username before merging happens * un-reverted fixes * oops * Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass (#33223) * First round of anomaly core functionalities added * Added sliceTime to anom meat mass and cooked version * Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core * Added more functions * Final touches to branch * Cleaning up some of the metadata for sprites and component definitions * PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml * Lol jk these goddamn tests why me * Quick updates based on feedback * more changes to improve * additional fixes and edits * Changed tech core functionality * added magboot functionality to grav core * fixed issue with bluespace core sizing * Reverting changes per request * extra file to be deleted * File cleanup * Update chemicals.ftl * Update cores.yml * Update cores.yml * Update meta.json * Update chemicals.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml Co-authored-by: chromiumboy <[email protected]> * Update meal_recipes.yml * Update cores.yml --------- Co-authored-by: august-sun <[email protected]> Co-authored-by: chromiumboy <[email protected]> * Automatic changelog update * Cog fixes (#33285) fixed the map (for real this time) * [Maps] Corvax CentCom fix (space-syndicate#2767) * Window sprite tweaks (#33282) * add * yes * Automatic changelog update * Automatic changelog update * [Maps] Astra goals (space-syndicate#2768) * Automatic changelog update * tag:with toolshed command (#31751) * Automatic changelog update * Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201) * Act * Adds Jaunt ECS and related prototypes * Adds jaunt sounds * Adds enter and exit sound support to polymorphs * Updates jaunt description * Adds jaunt action sprite and changes jaunt polymorph to use it * Adds Jaunt and upgrade to the wizard grimoire * Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt * Update Resources/Locale/en-US/store/spellbook-catalog.ftl Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <[email protected]> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <[email protected]> * removes meta changes * removes other meta changes * adds context menu and a description to basemobjaunt * comments for jaunt component and adds on component shutdown method * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Resources/Prototypes/Catalog/spellbook_catalog.yml --------- Co-authored-by: lzk <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Update Label workflows to use new labels (#33310) * Update labeler.yml * Update labeler-needsreview.yml * Update labeler-staging.yml * Update labeler-stable.yml * Update labeler-untriaged.yml * Create labeler-size.yml * Update labeler-size.yml * Update labeler-size.yml * Update conflict-labeler.yml * Rename conflict-labeler.yml to labeler-conflict.yml * Fix mime broken vow alert (#33303) Swap VowAlert and VowBrokenAlert on lines 149 and 150 so that the proper alerts are cleared and shown * Automatic changelog update * Borg type switching. (#32586) * Borg type switching. This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything. New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis. These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI. The modules that each borg type starts with: * Generic: tools * Engineering: advanced tools, construction, RCD, cable * Salvage: Grappling gun, appraisal, mining * Janitor: cleaning, light replacer * Medical: treatment * Service: music, service, clowning Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5. Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire. The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs. Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those. The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future. There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code. * Fix sandbox failure due to collection expression. * Module tweak Fix salvage borg modules still having research/lathe recipes Engie borg has regular tool module, not advanced. * Fix inventory system breakage * Fix migrations Some things were missing * Guidebook rewordings & review * MinWidth on confirm selection button * Automatic changelog update * Marathon Station: Added air alarms to CMO, Surgery, Security Checkpoint (#33213) * add air alarms to sec checkpoint, cmo and western surgery * decals and cleanup * Meta Station: Add a fully functional TEG room (#32941) * initial commit * delete WIP-marker.md * add TEG room, move gas chambers up * remove outside burn chamber button, add naming to APC, SMES, Substation * add HV below TEG Substation * removed invalids * Rule amendment - Remove role abandonment aHelp requirement. (#33287) * Role abandonment aHelp requirement. * disable roundstart chat message --------- Co-authored-by: slarticodefast <[email protected]> * [Maps] Maus minor tweak (space-syndicate#2774) * Automatic changelog update * Note expiry time is now relative instead of using timestamps (#33262) * Add the stuff * Loc fix * fixes * Change * Automatic changelog update * Update Core (#33325) add * Prevent Digiboard recycling (#33315) * add `HighRiskItem` tag * Correct tags Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Atro tiles weather disable (space-syndicate#2777) * Weather tweak (space-syndicate#2778) * Command external airlocks (#33333) add * New ruin variant (#33332) add * Edited Snow White reaction to output proper amount of drink. (#33331) Co-authored-by: RedBookcase <[email protected]> * Automatic changelog update * Add succumb action 10 sec delay (#32985) * Add succumb action 10 sec delay * add somthing * add delay to last words as well --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Adds gorilla gauntlet storage sprite and updates hit sound (#33167) * Adds storage sprite for gorilla gauntlet * Specifies a heavier hitsound for gorilla gauntlet * Modifies gauntlet icon and storage sprite * Updates credit to my new username * Clumsy system refactor (#31147) * First commit * Fixes * Added the noise * Renames * Timespan * Fixed space * entity -> ent * This shouldn't work * opps.... * Datafield name change * Better comments * small comment * Personal skill issue * Event renames and stuff * Couple fixes * Defib ref fixes (Silly me) * Added clumsy back! * no hard code clumsy! * Identity fix * Event name change * Comment change * Function name change * opp * Update names * Damage stuff! * Fixes! * Fixes * opps * This was hidden away!! * negative diff feeds me * Automatic changelog update * Improve crayon UI to not be stuck in 1996 (#33101) * Improve crayon UI to not be stuck in 1996 * Make a horrifying crayon spaghetti * Crayon * Undeprecate the crayon, describe the crayon * Automatic changelog update * BRB sign in the Bureaucracy Crate (#33341) Added the brb sign to the Bureaucracy Crate * Automatic changelog update * Fix utensils not being thrown away (#33326) * Automatic changelog update * Fix server crash when the seed extractor is used on the dev map (#33312) handle event when using seed extractor Co-authored-by: slarticodefast <[email protected]> * Solar assembly crate buff (#33019) * more flatpacks + glass * solar crate price increase * price increase * 1250 spesos * Update Resources/Prototypes/Catalog/Fills/Crates/engines.yml --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Add admin remarks button to lobby (#31761) * Automatic changelog update * [Art] Conveyor resprite (space-syndicate#2565) Arrow added * Cog christmas update (#33344) christmas updoot * Box Holiday Update (#33340) Added holiday decorations with presents and various fixes * Marathon holiday update (#33335) * Added holiday decorations, and modified emergency lights to have a better layout. * Added a couple more emergency lights after finding a couple spots that were wway too dark during testing, also gave the warden a crew monitor * bagel christmas update (#33347) * Throwing Knife description tweak (#33349) changed description * Update Credits (#33360) Co-authored-by: PJBot <[email protected]> * Adds paper label visuals to closets and lockers (#33318) * Modifies label sprites and adds label visuals to closets * Removes redundant GenericVisualizer component * Automatic changelog update * Omega Update (Christmas Edition) (#33357) * Christmasift Omega station. * Add cryosleeper to bridge. * Packed Update (Christmas Edition) (#33356) Christmasified Packed station. * Wizard Summon Guns/Magic (#32692) * mostly done but there's a bug with spawning * RandomGlobalSpawnSpellEvent now actually works * Summon Guns/Magic is working * Added sound, cap gun, and auto pick up * Added all requested changes/fixes from reviews * Halving cooldowns * Chemical synthesis kit tweak (#33345) * butcherable surgery caps * readded cardboard box * butcherable now? * butcherable now? * one day ill figure this out * changed label of hyperzine syringe * removed the thing in hats.yml that wasn't supposed to be here * Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml --------- Co-authored-by: slarticodefast <[email protected]> * Dim light bulbs (#33383) add * Automatic changelog update * Shift air alarm sprites to better reflect their direction (#33379) * Shift Air Alarm sprites to better reflect their direction * Fix two frames of west-facing sprite being one pixel off * Indicate that sprites are no longer exactly tgstation's * replace zzz (space-syndicate#2758) * Арт "Культ Нар'Си" (space-syndicate#2603) * Avrite update (space-syndicate#2782) * Automatic changelog update * add new goal and tweak others (space-syndicate#2673) Co-authored-by: NotSoDamn <[email protected]> * reduce mime and clown playtime requirement (space-syndicate#2668) * Automatic changelog update * remove HiddenDesc from Implanters (space-syndicate#2530) * fix antags hidden desc (space-syndicate#2702) Co-authored-by: Kill_Me_I_Noobs <[email protected]> * Automatic changelog update * Replace direct uses of GameTicker dictionary with `TryGetValue` (#33222) Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario * Service Worker Job Icon Change (#33361) * Changes the Server Worker job icon to a bowtie. * Removes grey from icon to better fit existing art. * Updated ID card sprite. * Edit respective meta.json files. * Cog update (#33410) removed fun * fix viewing nav slowing shuttle down (#32381) fix * Automatic changelog update * Welded secret doors no longer say they are welded shut. (#33365) Init * Automatic changelog update * Update locale * Remove locale borg parts * [Maps] Glacier update (space-syndicate#2788) * [Maps] ERT&Salvage shuttle update (space-syndicate#2789) * Automatic changelog update * Rebalancing zombie mode chances (space-syndicate#2791) * Automatic changelog update * Syndicate footsoldiers now have death acidifier as an autoimplant (space-syndicate#2792) * Automatic changelog update * nerf maxcap radius (space-syndicate#2794) * Automatic changelog update * Corvax New Year stuff (space-syndicate#2793) * Automatic changelog update * [Maps] Avrite update (space-syndicate#2796) * Automatic changelog update * Translate Upstream space-syndicate#2785 (space-syndicate#2797) Co-authored-by: lapatison <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: cfif126 <[email protected]> * Добавление скрытого описания модулей киборгов (space-syndicate#2544) Co-authored-by: Kill_Me_I_Noobs <[email protected]> * Automatic changelog update * set see own notes to true (space-syndicate#2786) * Automatic changelog update * [Maps] Astra Winter Update (space-syndicate#2798) * Automatic changelog update * Displacement maps for Vulpas and Reptiles (space-syndicate#2447) * fix reptilians * Remove brigmed from paper * Also remove brigmedic from avrite * fix prices for tests --------- Co-authored-by: Jezithyr <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: beck-thompson <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: Vasilis The Pikachu <[email protected]> Co-authored-by: Thomas <[email protected]> Co-authored-by: BramvanZijp <[email protected]> Co-authored-by: Stalen <[email protected]> Co-authored-by: deathride58 <[email protected]> Co-authored-by: cohanna <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Armok <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Shaddap1 <[email protected]> Co-authored-by: scrivoy <[email protected]> Co-authored-by: lastPechkin <[email protected]> Co-authored-by: IanComradeBot <[email protected]> Co-authored-by: Kill_Me_I_Noobs <[email protected]> Co-authored-by: Zekins <[email protected]> Co-authored-by: leonidussaks <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: BramvanZijp <[email protected]> Co-authored-by: Halches <[email protected]> Co-authored-by: Andrew Montagne <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Preston Smith <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: TiFeRi <[email protected]> Co-authored-by: SpaceRox1244 <[email protected]> Co-authored-by: August Sun <[email protected]> Co-authored-by: august-sun <[email protected]> Co-authored-by: chromiumboy <[email protected]> Co-authored-by: Spessmann <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: dffdff2423 <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: CheddaCheez <[email protected]> Co-authored-by: Meguneri <[email protected]> Co-authored-by: Saphire <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]> Co-authored-by: RedBookcase <[email protected]> Co-authored-by: RedBookcase <[email protected]> Co-authored-by: Southbridge <[email protected]> Co-authored-by: MossyGreySlope <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: ThatGuyUSA <[email protected]> Co-authored-by: Spanky <[email protected]> Co-authored-by: ActiveMammmoth <[email protected]> Co-authored-by: SpaceManiac <[email protected]> Co-authored-by: CaptainMaru <[email protected]> Co-authored-by: faint <[email protected]> Co-authored-by: Ilya246 <[email protected]> Co-authored-by: Morb0 <[email protected]> Co-authored-by: NazrinNya <[email protected]> Co-authored-by: lapatison <[email protected]> Co-authored-by: lapatison <[email protected]> Co-authored-by: cfif126 <[email protected]> Co-authored-by: Nim <[email protected]> Co-authored-by: Litogin <[email protected]>
aw-c
pushed a commit
to SS14RU/space-station-14
that referenced
this pull request
Dec 5, 2024
Co-authored-by: Kill_Me_I_Noobs <[email protected]>
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.
Описание PR
Добавление скрытого описания для синдикатских модулей боргов, и ящика инструментов турели.
Медиа
Проверки
🆑 Nimfar11