RedFoxIV
5a69c4e660
weed eater ( #297 )
2025-03-08 21:20:19 +02:00
RedFoxIV
efca951b7c
[феатуре] ms paint ( #279 )
...
* genuinely disappointed
* +
* cleanup
* Update Content.Client/_White/Overlays/CrayonPreviewOverlay.cs
* 123
* 456
* забыл
* ой блять
---------
Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com >
2025-03-05 16:03:22 +02:00
Avalon
cbd63b94ae
Port Magic Crayon From Frontier ( #2410 )
...
* ART
* Update clown.yml
* Loadout fixes, time req
* loadout bgone
* Fixes, moved things
* fixoneoops
* More fixes
* CRAFTING WORKS!
* Flipped slashes
* UNTOUCHED! AT LAST
* Fix comment
* Mailladd
* Webedit ops
Signed-off-by: Avalon <jfbentley1@gmail.com >
* untroll indent
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
---------
Signed-off-by: Avalon <jfbentley1@gmail.com >
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
(cherry picked from commit fe630d7391693b4ee6cb389f4460c064ae3e8d21)
2025-02-05 18:35:28 +03:00
Saphire Lattice
2277f5a039
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
(cherry picked from commit 26ffe940b56e98d7d2ebce84da343245bf998aad)
2025-01-20 20:45:01 +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
metalgearsloth
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-12-02 20:16:36 +01:00
Leon Friedrich
1465c02a77
Move ActorComponent to shared ( #21293 )
2023-10-31 19:12:44 +01:00
Kara
4f5142356a
Kill UserInterfaceHelpers ( #20912 )
2023-10-14 22:02:34 +02:00
metalgearsloth
f38f0ab614
Predict StorageComponent ( #19682 )
2023-09-27 21:59:12 +02:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Checkraze
6ac3c4dc08
Crayonsystem cleanup ( #13400 )
...
Co-authored-by: 0x6273 <0x40@keemail.me >
2023-02-26 23:55:44 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. ( #8728 )
2022-06-13 09:45:47 +10:00
wrexbe
2d882e78bb
Prevent accidental crayon eating ( #8799 )
2022-06-12 15:52:51 -07:00
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager ( #8492 )
...
* Make log not entity system
* Fixes
2022-05-28 23:41:17 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Paul Ritter
005321e484
make crayoncode use the colortype ( #7975 )
2022-05-09 15:16:43 +10:00
Kara
4fe648bb06
delicious delicious crayons ( #8021 )
...
* Edible crayons
* yeah why not
2022-05-08 01:51:33 -07:00
Flipp Syder
2325a7df94
Rainbow crayon + color-selectable crayons ( #7786 )
2022-04-28 22:23:45 +10:00
actually-reb
85231bb9d6
crayons deleted when used up ( #7282 )
2022-03-27 01:09:48 -07:00
Leon Friedrich
e3ead6a3ba
Remove IDropped ( #7075 )
2022-03-13 19:47:28 +11:00
Leon Friedrich
b1e719c70d
Remove IUse ( #7074 )
2022-03-12 23:33:23 +11:00
metalgearsloth
627cbba2b6
Crayons ECS ( #6364 )
2022-02-06 23:32:32 +11:00
Leon Friedrich
dd61fb46ea
Adjust interaction ordering & interaction conditions ( #6387 )
2022-02-05 13:39:01 +11:00
Leon Friedrich
7f81f0b8b8
Add more pretty strings to logs ( #5768 )
2021-12-13 12:22:58 +01:00
Vera Aguilera Puerto
684cb76173
Bunch more resolves removed.
2021-12-08 17:17:12 +01:00
Vera Aguilera Puerto
3f79e3754f
Merge branch 'master' into 2021-12-03-remove-IEntity-komm-süsser-todd
...
# Conflicts:
# Content.Client/Crayon/CrayonDecalVisualizer.cs
# Content.Client/Tabletop/TabletopSystem.cs
# Content.IntegrationTests/Tests/InventoryHelpersTest.cs
# Content.Server/AI/EntitySystems/AiSystem.cs
# Content.Server/AI/Utility/AiLogic/UtilityAI.cs
# Content.Server/AME/AMENodeGroup.cs
# Content.Server/Administration/AdminVerbSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chemistry/Components/InjectorComponent.cs
# Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
# Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
# Content.Server/Crayon/CrayonComponent.cs
# Content.Server/Doors/Components/ServerDoorComponent.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Fluids/Components/MopComponent.cs
# Content.Server/Fluids/Components/SpillExtensions.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/Instruments/InstrumentSystem.cs
# Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
# Content.Server/Storage/Components/EntityStorageComponent.cs
# Content.Server/Storage/Components/StorageFillComponent.cs
# Content.Server/Stunnable/StunbatonSystem.cs
# Content.Server/Throwing/ThrowHelper.cs
# Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
# Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
# Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
# Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
# Content.Shared/Damage/Components/DamageableComponent.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/MobState/Components/MobStateComponent.cs
# Content.Shared/Slippery/SharedSlipperySystem.cs
2021-12-07 17:48:49 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Paul Ritter
219d91c6da
decal system & crayons ( #5183 )
...
Co-authored-by: Paul <ritter.paul1+git@googlemail.com >
2021-12-03 15:35:57 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
5e177ae734
Inline EntityManager
2021-12-03 11:18:05 +01:00
Paul Ritter
fbcb53dcc0
pvs content ( #5484 )
...
Co-authored-by: Paul <ritter.paul1+git@googlemail.com >
2021-11-30 15:20:38 +01:00
Pieter-Jan Briers
64861ff034
Add Content.Shared.Database ( #5588 )
2021-11-28 14:56:53 +01:00
Moony
c576eb91d3
Adds like 17 new logs ( #5499 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2021-11-24 23:52:31 +01:00
JasperJRoth
cd91e6c06b
Crayon fix ( #4848 )
...
* removed line that broke crayon decals
* Removed rotation from crayon decals.
2021-10-12 23:56:35 -07:00
Vera Aguilera Puerto
0767bd3777
Popup ECS Refactor ( #4692 )
2021-09-26 15:18:45 +02:00
ShadowCommander
b8e6a996d4
Fix missing sounds ( #4466 )
...
* Fix missing sounds
* Make SoundHitSpecies fallback to SoundHit
* Fix crayon YAML
* Update PlaySoundBehavior YAML
* Fix required
2021-08-13 21:31:37 -07:00
Galactic Chimp
57016d14b4
removed TryGetSound + made some SoundSpecifier datafields required
2021-07-31 19:52:33 +02:00
Galactic Chimp
f531c65a0b
Merge branch 'master' into replace-sounds-with-sound-specifier
...
# Conflicts:
# Content.Server/Actions/Actions/DisarmAction.cs
# Content.Server/Actions/Actions/ScreamAction.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
# Content.Server/Explosion/Components/FlashExplosiveComponent.cs
# Content.Server/Physics/Controllers/MoverController.cs
# Content.Server/Portal/Components/PortalComponent.cs
# Content.Server/Portal/Components/TeleporterComponent.cs
# Content.Server/Projectiles/Components/ProjectileComponent.cs
# Content.Server/Singularity/Components/EmitterComponent.cs
# Content.Server/Sound/EmitSoundSystem.cs
# Content.Server/Stunnable/Components/StunbatonComponent.cs
# Content.Server/Tools/Components/MultitoolComponent.cs
# Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
# Content.Shared/Gravity/GravityComponent.cs
# Content.Shared/Light/Component/SharedExpendableLightComponent.cs
# Content.Shared/Maps/ContentTileDefinition.cs
# Content.Shared/Slippery/SlipperyComponent.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
2021-07-25 14:12:00 +02:00
mirrorcult
ffee1482d9
Fix crayon decal spawning exception ( #4355 )
...
* Fix crayon spawning
* Popup message
2021-07-25 18:44:26 +10:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Galactic Chimp
ce3c59e0e6
replacing sound (collection) names with SoundSpecifier - part 1
2021-07-10 17:35:33 +02:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances ( #4155 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
2021-06-21 02:13:54 +02:00
Acruid
15fb554c28
Engine Entity Anchoring Changes ( #4195 )
...
* Converted all SnapGridPositionChangedEvent subscriptions to AnchorStateChangedEvent.
* Fixes power tests with new anchored requirements.
* Moved AnchorableComponent into construction.
AnchorableComponent now uses Transform.Anchored.
* Fixed bug with nodes, power works again.
* Adds lifetime stages to Component.
* Update Engine to v0.4.70.
2021-06-19 19:41:26 -07:00
DrSmugleaf
f878f353e4
Move some files out of Content.Shared root because I forgot ( #4182 )
2021-06-13 22:52:40 +10:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00