keronshb
9736685b4e
Mjollnir and Singularity Hammer for Wizard ( #34446 )
...
(cherry picked from commit a9054c5e9c8f595874c034abd14fc63b3831a411)
2025-11-20 17:09:44 +03:00
Spatison
2a10c02eb5
No spead merge ( #475 )
...
* Revert "[GoobPort] WIZ REAL (#465 )"
This reverts commit 091a8ff433
2025-04-26 10:50:32 +03:00
Kai5
091a8ff433
[GoobPort] WIZ REAL ( #465 )
...
* Уэээээээ
* Почти настрадались
* Скоро конец....
* СКОРО
* Мышки плакали, кололись, но продолжали упорно жрать кактус
* Все ближе!
* Это такой конец?
* Книжка говна
* фиксики
* ОНО ЖИВОЕ
* Телепорт
* разное
* Added byond
* ивенты теперь работают
* Разфикс телепорта
* Свет мой зеркальце скажи, да всю правду доложи - Я ль робастней всех на свете?
* Разное
* Еще многа всего
* Многа разнава
* Скоро конец....
* ЭТО КОНЕЦ
* Фикс линтера (ну, или я на это надеюсь)
* Еще один фикс линтера
* Победа!
* фиксики
* пу пу пу
* Фикс подмастерья
* Мисклик
* Высокочастотный меч
* Неймспейсы
* Пул способностей мага
2025-04-26 10:18:58 +03:00
DEATHB4DEFEAT
47b10a01b0
Catch-Up Cherry Pick 2 ( #944 )
...
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540 .
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com >
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com >
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com >
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com >
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com >
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@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: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com >
Co-authored-by: ShadowCommander <shadowjjt@gmail.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Jezithyr <jezithyr@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Ciac32 <aknoxlor@gmail.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com >
Co-authored-by: Vasilis <vasilis@pikachu.systems >
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com >
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com >
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com >
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com >
Co-authored-by: exincore <me@exin.xyz >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com >
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com >
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com >
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com >
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com >
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com >
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com >
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com >
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com >
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: ike709 <ike709@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com >
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com >
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
2024-10-19 14:53:37 +07:00
Pieter-Jan Briers
e7a3b82a8d
Use new ComponentPauseGenerator ( #25183 )
...
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
2024-03-07 00:57:05 +01:00
metalgearsloth
69d6935846
Bunch of revolver fixes ( #19649 )
...
* Bunch of revolver fixes
Some stuff wasn't working with prediction so this should fix all of it.
* a
* fix weh
* Also usedelay
(cherry picked from commit 9bb2781bfca68bde47ce52576cb894bb41ab6511)
2024-01-27 23:40:28 +01:00
AJCM-git
92cdcf4a8a
Fixes UseDelay accumulating time sometimes ( #23529 )
...
a
(cherry picked from commit 3502f5d3dba80110f64dfc6f22ffc869487ad227)
2024-01-26 21:39:30 +01:00
AJCM-git
6b7e8b4f5b
UseDelay + ItemCooldown merge ( #22502 )
...
(cherry picked from commit 9c522c8b19f7a6f6b396c66342413572a22d7845)
2024-01-26 21:32:09 +01:00
Leon Friedrich
82aa1d6a0f
Flammable system bug fixes. ( #21594 )
2023-11-19 22:07:43 +01:00
Debug
fd2cc8570d
Sync master up to 1/10 ( #74 )
...
* Automatic changelog update
* Make NPC names proper nouns & fix some genders (#20534 )
* Proper names & genders
* Uppercase proper names
* Make Smile female
* fix bingus wrinkly head (#20531 )
* rouny meat and steak (#20526 )
* lost friendship flavor
* add rouny steak
* rouny special meat
* rouny meat textures
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311 )
* Explosive wet floor sign & janitorial suicide vest
* fix attributions
* Remove name & desc from explosive wet floor sign
* Make wet floor sign chameleonable
* Automatic changelog update
* Minor slippery stuff (#20535 )
* Update submodule to 162.2.0 (#20570 )
* Predicted armor (#20560 )
* clean up some lines in smile the slime prototype (#20552 )
* Revert "Use full file path for temp replays (#19002 )" (#20545 )
* Add EyesGlasses into ClothesMate (#20523 )
* Automatic changelog update
* Fix Punpun crew monitor sensor (#20484 )
* Automatic changelog update
* EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394 )
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
* Automatic changelog update
* Make arcades hackable again (#20555 )
* Automatic changelog update
* Health alert tweaks (#20557 )
* Automatic changelog update
* Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564 )
* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent
* Nukeops todo and cleanup
* Remove Active field
* Add EndedGameRuleComponent
* bartender suit (#20521 )
* give me a drink bartender
* guh
* aARG
* Necropolis and mine walls (#20578 )
* Automatic changelog update
* archaic accent tweaks (#20567 )
* Automatic changelog update
* Add confirmation to kick and respawn in the admin player actions panel (#20542 )
* Remove windows-latest CI runs, remove unused build-test-release.yml (#20540 )
* Change .editorconfig to keep existing attribute arrangement (#20538 )
* Automatic changelog update
* Catch replay start and end errors on round restarts (#20565 )
* Update trivial components to use auto comp states (#20539 )
* Fix role unbans not applying in real time (#20547 )
* Disable AHelp buttons when no player is selected, update button styling (#20568 )
* Automatic changelog update
* Added a toggle fullscreen button (default F11) (#20272 )
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
* Automatic changelog update
* Fix not networking markings (#20588 )
* Automatic changelog update
* Update RobustToolbox to v162.2.1 (#20590 )
* Automatic changelog update
* Glorfcode (force say on damage/stun/crit) (#20562 )
* Automatic changelog update
* Fix AHelp progressively showing more AHelp panels (#20591 )
* Automatic changelog update
* caninsert entitystorage tweaks (#20589 )
* Automatic changelog update
* Fix mapping actions crashing on load (#20592 )
* Fix loading a map with a ThirstComponent crashing the game (#20594 )
* Fix electrocution displaying real name of disguised players (#20603 )
* Organ fixes (#20488 )
* Automatic changelog update
* Kettle medical rework (#20435 )
* Initial try at medical rework for kettle
* Re-add decal decorations to Kettle's medical
* Add more lockers to kettle's med
* Actually upload kettle's map, not its proto
* Automatic changelog update
* Added blocked visuals to volumetric pump (#20610 )
* Automatic changelog update
* Move TimedDespawn to engine (#20515 )
* Update submodule to 163.0.0 (#20616 )
* Remove v0.1 version number from local main menu screen (#20617 )
* Remove cloneData parameter from AutoNetworkedField (#20596 )
* Update submodule to 164.0.0 (#20618 )
* fix cognizine ghost role (#20632 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Move ID layer one pixel to correct alignment (#20630 )
* Update nukie hardsuit descriptions (#20529 )
* Make holofans destructable (#20445 )
* Automatic changelog update
* bowl is open (#20453 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add TestPair.WaitCommand() (#20615 )
* Rename ThreatPrototype and mark fields as required (#20611 )
* Adjust hard bomb shape (#20608 )
* dragon refactor, objectives and use GenericAntag (#20201 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Added generic empty liquids tank (#20563 )
* Move view variables verb to the top of the list with no category and localize it (#20546 )
* saltern update (#20325 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix followers leaking (#20643 )
* Add Winter Boots (#20622 )
* add
* fix prototype
* Add QM mantle (#20621 )
* add
* fix prototype
* Automatic changelog update
* Slime mobs breathe nitrogen and resprite their organs (#20577 )
* Slimes breathe nitrogen and resprite their organs
* ups
* mmm
* Automatic changelog update
* Fix the new lizard horn's consistency + issue (#20620 )
* fix
* add
* Revert "add"
This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.
* Add RandomHumanoidAppearance component to for space ninjas (#20605 )
* Automatic changelog update
* Space cat breathes space (#20550 )
* Space cat breathes space
Made Space Cat lungs ROBUST
* Made Space Cat's lungs ROBUST 2.0
* Automatic changelog update
* Wide anomaly locator (#20581 )
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* add textures
* fix encoding
* fix 2
* Automatic changelog update
* Fixed Telescopic Shield Lighting (#20650 )
* Fixed Telescopic Shield Lighting Bug fix #20199
* no need for these at all
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
* Automatic changelog update
* Add a special hardsuit for nukie medic (#20471 )
* Automatic changelog update
* Carry over other mutations when doing species mutation (#20551 )
* Automatic changelog update
* Add Spanish accent to poncho and sombrero (#20377 )
---------
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com >
Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com >
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com >
Co-authored-by: Miro Kavaliou <miraslauk@gmail.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com >
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com >
Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com >
Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com >
2023-10-03 14:15:46 -05:00
Leon Friedrich
a9b268af49
Remove use delay cancellation tokens ( #14405 )
2023-03-06 03:42:04 +11:00
metalgearsloth
6fa9104ad7
Update content for pause event changes ( #12970 )
2022-12-14 11:55:51 +11:00
metalgearsloth
c3a208234a
Stun baton tweaks ( #9225 )
...
* Stun baton tweaks
* a
* sprotes
2022-06-27 17:51:38 +10:00
metalgearsloth
b5615b2564
Fix UseDelay crash ( #8324 )
2022-05-20 22:50:38 -07:00
Leon Friedrich
0f435f31c8
Predict general interactions. ( #6856 )
2022-03-09 18:12:17 +11:00
