Daniel
7b3f255732
CopyMachineFix ( #2900 )
...
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-25 03:19:03 +03:00
iertis
1a62c50d57
Великий фикс апстрима ( #2821 )
...
Co-authored-by: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com>
2025-08-18 01:28:45 +03:00
Vigers Ray
d1ef2f7fc7
Copy machine fix ( #2806 )
2025-08-16 06:20:10 +03:00
iertis
0d72c1bd9e
Добавил возможность кастомизировать цвет шрифта бумаги ( #2492 )
2025-07-08 05:13:27 -04:00
Vigers Ray
d6c0a011b7
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Client/Fax/UI/FaxWindow.xaml
# Content.Client/Ghost/GhostSystem.cs
# Content.Client/Holiday/HolidaySystem.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Mech/MechSystem.cs
# Content.Client/Stealth/StealthSystem.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
# Content.Server/Bed/BedSystem.cs
# Content.Server/Body/Systems/BodySystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Communications/CommunicationsConsoleComponent.cs
# Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
# Content.Server/EntityEffects/Effects/MakeSentient.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
# Content.Server/EntityEffects/Effects/PlantMutateGases.cs
# Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Bed/Components/HealOnBuckleComponent.cs
# Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
# Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
# Resources/Locale/en-US/_strings/chat/chat-channel.ftl
# Resources/Locale/en-US/_strings/components/screen-component.ftl
# Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
# Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
# Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
# Resources/Locale/en-US/_strings/salvage/job-board.ftl
# Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
# Resources/Locale/en-US/_strings/ui/turret-controls.ftl
# Resources/Maps/_Sunrise/Station/box.yml
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/service.yml
# Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Clothing/Masks/masks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/alien3.png
# Resources/Textures/Effects/speech.rsi/alienroyal3.png
# Resources/Textures/Effects/speech.rsi/default3.png
# Resources/Textures/Effects/speech.rsi/guardian3.png
# Resources/Textures/Effects/speech.rsi/holo3.png
# Resources/Textures/Effects/speech.rsi/lawyer3.png
# Resources/Textures/Effects/speech.rsi/lizard3.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Effects/speech.rsi/robot3.png
# Resources/Textures/Effects/speech.rsi/slime3.png
# Resources/Textures/Effects/speech.rsi/spider3.png
# Resources/Textures/Effects/speech.rsi/syndibot3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
# Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel_dirty.png
# Resources/migration.yml
# runclient-Tools.bat
# runclient.bat
2025-05-27 03:41:41 +03:00
pathetic meowmeow
cfba56c2b4
Make departmental orders consoles print slips ( #36944 )
...
* Make departmental orders consoles print slips
* feed back cycle
2025-05-06 15:04:18 -04:00
Vigers Ray
9cc7ae5a5e
Принтер документов ( #2062 )
2025-05-05 11:42:47 +03:00
Southbridge
7eb714d38f
Monospace Support for Rich Text ( #33830 )
...
* Initial Commit
* Moved all this to SS14 on it's own
* Added prototype validation
2024-12-13 15:24:34 +01:00
FluffMe
8961dd35a5
Fix accidental erase of paper contents by spamming save action ( #32598 )
...
Fix spammable paper save issue
2024-10-02 14:00:31 +02:00
eoineoineoin
594aad0fa9
Paper QOL improvements ( #32418 )
...
* Don't add newlines (fixes #32357 )
* Improve UI around max paper length (Fixes #32344 )
* Display a "fill progress" indicator so users know how close they are to filling it
* Don't allow users to save a paper which went over the limit, to avoid them losing data they want to keep.
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-09-24 09:36:05 +10:00
Plykiya
01e1624567
Move PaperSystem to Shared ( #30592 )
...
* Fix paper system late localization
* IS THIS WHAT YOU WANT
* well I guess this is happening now
* fix the BUI
* did that even do anything before?
* again with the escapeformatting...
* Dirtying
* Move dirty to function
* Rename PaperSystem to PaperVisualizerSystem
* Fix namespace
* how many namespace changes must I suffer through
* SetContent is for Setting Content
* minor shuffling
* review
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-08-05 14:23:23 +10:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
Pieter-Jan Briers
d385c1bb23
Paper save button, back to ctrl+enter save. ( #25870 )
...
* Revert "Change keybindings for paper (#25853 )"
This reverts commit 4b56996fcd
2024-03-06 12:35:26 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
/ʊniɹɑː/
f2954fff96
allow richtext on papers + edit premade documents ( #18154 )
2023-08-22 21:50:03 +10:00
eoineoineoin
4ccc8a04be
Improve paper stamping experience ( #17135 )
2023-08-13 14:28:10 -04:00
eoineoineoin
08d6a42983
Minor visual fixups from StyleboxTexture scaling ( #17763 )
2023-07-09 04:57:47 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
eoineoineoin
9194c548f8
Fix bugs when updating paper UI ( #17786 )
2023-07-02 08:43:27 -04:00
Echo
68eb28ac95
Enhance paperwork UI ( #16006 )
2023-05-06 17:35:22 +10:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
eoineoineoin
bda5f8248f
Improve Paper UI, allow an to entity configure how it's UI looks ( #13494 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-17 19:32:46 +11:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
wrexbe
cea1b21832
Fixing some warnings ( #6250 )
...
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
Paul Ritter
cc57d1380c
Revert Rich text ( #5848 )
2021-12-20 12:42:42 +01:00
E F R
b2da936848
Everything: Rich text redux ( #5625 )
...
* lord save me
* UI/ChatBox: Use the new `defStyle` param for `RenderMarkup`
The previous iteration didn't work because `AddMessage` can't inherit
its color from the PushColor (since we're not doing actual tag stacks
anymore).
* rebase touchup
2021-12-12 18:25:42 -08:00
Visne
ac78145b94
Remove encapsulation for previously protected XAML UI fields ( #4975 )
2021-10-28 14:23:17 +02:00
Visne
093cf98b93
PaperWindow to XAML UI ( #4639 )
...
* Rename/add files
* PaperWindow to XAML
2021-09-19 10:01:01 -07:00
