Jb merge ee master#24
Merged
Merged
Conversation
(cherry picked from commit 2d405c9)
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry. * remove exclamation marks from names * naming fix * Rejected trademark application for 'Farmers Helper'. --------- Co-authored-by: PraxisMapper <praxismapper@gmail.com> (cherry picked from commit 511d759)
* Remake bottles and syringes names to use labels * vial * fix and add stuff (cherry picked from commit 9680c1d)
* Init testing * copyright * oops * Tracking the embed entity uid * testing stuff for gradual injection * work * weh * god save me * bleh * Yippee! * Again * Mini syringe ammo * cleaning up * mini syringes have a texture for fill amount * -3 cool points :( * hitboxes * init cleanup * much needed fixes * Fixes (cherry picked from commit 62f5a31)
* 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> (cherry picked from commit 0aebc76)
(cherry picked from commit c6d718d)
…(#29673) (cherry picked from commit 347bed8)
Allow zoom command to modify an eye's PVS range Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit 1faa1b5)
…1 (#31626) (cherry picked from commit 5c782d3)
* Initial commit * Updated values to reflect new resistances * Review fixes * Review fixes * LINQ BEGONETH (cherry picked from commit e58d031)
* working mind swap spell * Removing unncessary spacing Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Changing mind swap speech Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> * All requested changes in review * Stores owned by mind instead of body * Requested changes, traitor uplink fixed * Revert "Requested changes, traitor uplink fixed" This reverts commit 2ceac6733d6a28890f60d2ccef3dafa160a702fd. * Revert "Stores owned by mind instead of body" This reverts commit dfb72ab70ed66db50312617f2dce02d0a4e4dfce. * Separate target and performer stun duration --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> (cherry picked from commit cd23805)
* Adds chirping to adult diona * Added vocals for diona nymph * Nymphs now have a speechsound (cherry picked from commit 3a917bc)
(cherry picked from commit 23f0b30)
* Adds single clap emote * Adds missing single clap loc * Adds void blink effects, sound, and sprite * Adds VoidApplauseEvent and implements it into the Magic System and Grimoire * Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future. * Makes spells Mono * Changes to swap positions. * Makes Void Applause target body only * Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Client/Magic/MagicSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Audio/Effects/Emotes/attributions.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/SoundCollections/emotes.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Removes duplicate effect spawning from server * Puts Void Applause effect on server, lets lizards hear clap * Adds single clap to diona --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 6565ba5)
* Renames Smite Spells yml to Touch Spells and Renames Smite Spells region to the same * Adds wizard clothes requirement to Smite. Adds Cluwne spell. Adds EnsureCompOnTouchSpellEvent and implements it in the magicsystem * Adds Smite and Cluwne to the grimore and loc for them * Adds Slippery Slope spell and SlipOnCollide * Adds handled for comp spell event * Removes super slippery * Removes EnsureCompOnTouchSpell it was redundant with ChangeComponentsSpellEvent * Makes requirement-free action for smite * checks if we should be slipping what we touch * Removes SlipOnCollide, adds negative speed for steptrigger * Removes slip on collide adds negative speed for steptrigger (cherry picked from commit c82f77e)
(cherry picked from commit bf6fd4d)
Begging people to learn how this programming language works before throwing random syntax into a file. None of these finalizers ever worked. I also checked whether they were memory leaks and needed *proper* shutdown logic, but they're all instantiated-once UI controls that last for the entire lifetime of the program so it's probably fine. (cherry picked from commit cf8fcb1)
(cherry picked from commit b94b523)
…old (#28127) * Make it possible to hide full health bars below a total damage threshold * Fix not setting state (cherry picked from commit 436344c)
* first part * second part - file scope namespaces * missing peice (cherry picked from commit 35c4e29)
Init (cherry picked from commit 437a586)
… (#34198) air alarm default settings modified for anaerobic crew (cherry picked from commit 8f4c49a)
* separate eyes and teeth * make it buildable and make fixture less abusable * norot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 6808558)
* add an emergency light node to the LightFixture construction graph * add a recipe entry to the construction menu for emergency light * make emergency light entity at the emergency light node on the graph * Make emergency light destroy to 1 steel and 1 glass shard to match the construction recipe Co-authored-by: BooleanBuckeye <booleanbuckeye@gmail.com> (cherry picked from commit ad78b30)
…#31975) resistances to directional windows (cherry picked from commit 7eb5c0a)
* added plastitanium walls and windows * Changed crack sprite on diagonal window from square to diagonal (cherry picked from commit 6a52de8)
…(#35648) * your commit? our commit. * skreee * show joined players before lobby players; comments * comments * playerinfo retains playtime data after disconnect * new connection status symbols (cherry picked from commit 6f23e10)
reorganize bwoink window layout (cherry picked from commit c7d9a45)
(cherry picked from commit 150f58a)
* Better admin note popup text visibility * Bring buttons closer to the border (cherry picked from commit bb67364)
* Add the stuff * Loc fix * fixes * Change (cherry picked from commit dfda557)
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> (cherry picked from commit 0a587c9)
(cherry picked from commit dcc1187)
Fix false and true in player-panel Add a new True string (cherry picked from commit 84f9dd0)
* Тыкнул и нету ЦК * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit bd51cf3)
ui shitcode (cherry picked from commit a4b0bef)
(cherry picked from commit 05de5bd)
* 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 (cherry picked from commit 8ea888d)
line spacing (cherry picked from commit 1b20121)
admin overlay order fix (cherry picked from commit a6d66e6)
Co-authored-by: Nikolai Korolev <korolevns98@gmail.com> Co-authored-by: drakewill-CRL <46307022+drakewill-crl@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+scarky0@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+drsmugleaf@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+electrojr@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+slambamactionman@users.noreply.github.com> Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: pocl v <24708225+pinkbat5@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: ShadowCommander <10494922+shadowcommander@users.noreply.github.com> Co-authored-by: Mervill <mervills.email@gmail.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Boolean-Buckeye <36829021+Boolean-Buckeye@users.noreply.github.com> Co-authored-by: BooleanBuckeye <booleanbuckeye@gmail.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Unisol <1929445+unisol@users.noreply.github.com> Co-authored-by: cohanna <conornhanna@gmail.com> Co-authored-by: Tiniest Shark <head.rebel@yahoo.com> Co-authored-by: JustinWinningham <justinmwinningham@gmail.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Partmedia <kevinz5000@gmail.com> Co-authored-by: Brandon Hu <103440971+brandon-huu@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+bramvanzijp@users.noreply.github.com> Co-authored-by: osjarw <oskariwjarvinen@gmail.com> Co-authored-by: Hreno <hrenor@gmail.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: PotentiallyTom <67602105+PotentiallyTom@users.noreply.github.com> Co-authored-by: august-sun <45527070+august-sun@users.noreply.github.com> Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+emogarbage404@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: UBlueberry <161545003+ublueberry@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+iproducewidgets@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+chief-engineer@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Ian <ignaz.k@live.de> Co-authored-by: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Co-authored-by: Plykiya <58439124+plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> Co-authored-by: Alzore <140123969+blackern5000@users.noreply.github.com> Co-authored-by: mubururu_ <139181059+muburu@users.noreply.github.com> Co-authored-by: Booblesnoot42 <108703193+Booblesnoot42@users.noreply.github.com> Co-authored-by: justdie12 <125140938+justdie12@users.noreply.github.com> Co-authored-by: Guillaume E <262623+quatre@users.noreply.github.com> Co-authored-by: Ilya246 <57039557+ilya246@users.noreply.github.com> Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Co-authored-by: JIP <jipdawg93@gmail.com> Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Co-authored-by: Iztok Bajcar <50874197+iztokbajcar@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: Golinth <amh2023@gmail.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Jophire <36978900+Jophire@users.noreply.github.com> Co-authored-by: LittleNyanCat <littlenyancat204@gmail.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Token <esil.bektay@yandex.com> Co-authored-by: Tr1bute <tomsredhammer@gmail.com> Co-authored-by: CaptainMaru <124701378+captainmaru@users.noreply.github.com> Co-authored-by: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: dffdff2423 <dffdff2423@gmail.com> Co-authored-by: Patrik Caes-Sayrs <heartofgoldfish@gmail.com> Co-authored-by: MilenVolf <63782763+milenvolf@users.noreply.github.com> Co-authored-by: deltanedas <deltanedas@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com> Co-authored-by: zHonys <69396539+zHonys@users.noreply.github.com> Co-authored-by: Centronias <charlie.t.santos@gmail.com> Co-authored-by: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: Nim <128169402+nimfar11@users.noreply.github.com> Co-authored-by: Niels Huylebroeck <red15@users.noreply.github.com> Co-authored-by: godisdeadLOL <169250097+godisdeadlol@users.noreply.github.com> Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com> Co-authored-by: Litraxx <39574458+litraxx@users.noreply.github.com> Co-authored-by: PopGamer46 <yt1popgamer@gmail.com> Co-authored-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: SpaceManiac <tad@platymuus.com> Co-authored-by: Andrew Montagne <andrew@montagne.uk> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: deathride58 <deathride58@users.noreply.github.com> Co-authored-by: wafehling <wafehling@users.noreply.github.com> Co-authored-by: c4llv07e <igor@c4llv07e.xyz> Co-authored-by: Łukasz Lindert <lukasz.lindert@protonmail.com> Co-authored-by: Łuaksz <test@test.com> Co-authored-by: 12rabbits <53499656+12rabbits@users.noreply.github.com> Co-authored-by: Zachary Higgs <compgeek223@gmail.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: IgorAnt028 <118114530+IgorAnt028@users.noreply.github.com> Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Milon <plmilonpl@gmail.com> Co-authored-by: Schrödinger <132720404+schrodinger71@users.noreply.github.com>
# Conflicts: # Resources/Prototypes/Entities/Objects/Tools/emag.yml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.