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
Tayrtahn
bd6645b021
Cleanup redundant SpriteSystem dependencies in VisualizerSystems ( #37758 )
...
Cleanup redundant SpriteSystem dependencies in VisualizerSystems
2025-05-23 14:12:20 -04:00
Tayrtahn
bd22361a6a
Cleanup more SpriteComponent warnings (part 2) ( #37527 )
...
* Cleanup warnings in MagazineVisualsSpriteTest
* Cleanup warnings in WiresVisualizerSystem
* Cleanup warnings in GunSystem.SpentAmmo
* Cleanup warnings in GunSystem
* Cleanup warnings in GunSystem.ChamberMagazine
* Cleanup warnings in MeleeWeaponSystem.Effects
* Cleanup warnings in ToggleableLightVisualsSystem
* Cleanup warnings in StatusIconOverlay
* Cleanup warnings in SpriteFadeSystem
* Cleanup warnings in PdaVisualizerSystem
* Cleanup warnings in EnvelopeSystem
* Cleanup warnings in MechSystem
* Cleanup warnings in MappingOverlay
* Cleanup warnings in LockVisualizerSystem
* Cleanup warnings in DragDropSystem
* Cleanup warnings in GhostSystem
* Cleanup warnings in TriggerSystem.Proximity
* Cleanup warnings in DragonSystem
* Cleanup warnings in PortableScrubberVisualsSystem
* File-scoped namespace for PortableScrubberVisualsSystem
2025-05-17 13:29:03 +10:00
Vigers Ray
95b86d7a4b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenu.xaml
# Content.Client/Construction/UI/ConstructionMenu.xaml.cs
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/Warps/WarpPointSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
# Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# Resources/Locale/en-US/_strings/plants/mutations.ftl
# Resources/Locale/en-US/_strings/stack/stacks.ftl
# Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Power/powercells.yml
# Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
# Resources/Prototypes/Recipes/Construction/structures.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
Milon
b9b854e179
ringer bugfixes ( #36936 )
...
AAAAAAAAAA
2025-04-29 19:08:23 +02:00
Vigers Ray
e2aab392db
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/PDA/PdaSystem.cs
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
slarticodefast
51e2607a12
cleanup RingerSystem ( #36731 )
...
cleanup ringersystem
2025-04-19 19:11:08 +02:00
Milon
6138fcdce9
Predict and cleanup RingerComponent ( #35907 )
...
* clean up most stuff
* move to shared
* works
* shuffle shit around
* oops! access
* fixes
* todo: everything
* SUFFERING
* curse you
2025-04-19 15:55:05 +02:00
Vigers Ray
ed0a30bb64
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
2025-02-19 13:16:37 +03:00
metalgearsloth
cf38814515
General storage fixes ( #34845 )
...
* Fix storage stars
* Fix some more storage bugs
- Fix positions not saving.
- Fix the 1-tick delay between parent and child storage UIs opening / closing.
- Fix BackButton being visible sometimes when it shouldn't be.
* milon is a furry
2025-02-17 19:24:34 +11:00
Vigers Ray
a6829006a4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Server/PDA/PdaSystem.cs
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
2025-01-04 06:17:03 +03:00
SlamBamActionman
21351df03a
Add Chameleon PDA ( #30514 )
...
* V1 commit
* Remove PDA name and unnecessary pda state
* Adds PDA to Chameleon backpack & thief toolbox
* Change to use AppearanceDataInit
* Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied
* Revert PDA name (this will be changed to another way later)
* Update PDA name updating to new system
* Fix yaml, and fix Agent ID chameleon
* Updated based on review
2025-01-02 19:23:28 +01:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
ShadowCommander
71d92c9f8a
Set default PDA uplink and music visibility to false ( #28373 )
...
* Set PDA uplink and music default visibility to false
#27376 seems to be the PDA receiving state before first PDA UI open
* Log error on PDA state received before first open
* Fix logging
* Fix error message
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-09-14 00:19:32 +10:00
VigersRay
d2c1a1df88
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03: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
VigersRay
680c0f859c
мелкие фиксы времени в КПК
2024-06-24 18:48:26 +03:00
VigersRay
c8d58ea007
фикс копирования даты и починил нажатие на кнопку ShuttleTimeButton в КПК
2024-06-23 20:54:13 +03:00
Rinary
cc815ace5a
фикс времени в КПК ( #142 )
...
* Time fix
* Some editings
* fix
* changes
* fix
2024-06-23 20:31:28 +03:00
VigersRay
8839e9c9df
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-13 00:22:11 +03:00
deltanedas
8c514b90fd
fix pda ui troll ( #28896 )
...
* fix pda ui troll
* bruh
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 20:10:53 +02:00
Rinary
5d34b76518
Отображение даты в КПК ( #47 )
...
* Vulpkanin Lang Fix
* Date time add
* Time System
* Something fixes
2024-06-09 02:59:06 +03:00
Vigers Ray
21465c02c0
Отображение времени к прибытию эвак шаттла в КПК ( #22 )
2024-06-05 14:34:36 +03:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
user424242420
6913ebcf05
Add ability to copy data from pda ( #23533 )
...
* This commit add ability to copy station name and time to clipboard
* Add ability to copy name and profession. Fix style of code.
* fix
* Make copy by pressing on label
* Fix style code
---------
Co-authored-by: Ivan Rubinov <linuxkernelpatch8234@riseup.net>
2024-01-08 11:06:44 +01:00
Mr. 27
31b1b6f0f4
fix pda pai ejection slot image ( #23547 )
...
14 loko
2024-01-04 17:56:29 -07:00
VMSolidus
84a2356831
Adding PAI Slot to PDA ( #21086 )
...
* Adding PAI Slot to PDA
* Update PdaComponent.cs
* Update pda.yml
* Update tags.yml
Sorting it alphabetically
* Adding PDA UI Elements.
* Addressing reviews
* Update PdaComponent.cs
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Content.Shared/PDA/SharedPdaSystem.cs
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Objects/Devices/pda.yml
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
* Update PdaComponent.cs
* Update PdaComponent.cs
---------
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-04 05:56:14 -07:00
Chronophylos
e24e0bdaf5
add localization for pda footer text ( #21749 )
2023-11-21 20:06:43 -05:00
DrSmugleaf
3e509d7630
Give ringtone setting a 0.25 second cooldown, style and fixes ( #20780 )
2023-10-08 17:25:08 -04:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Phill101
600621e7ee
Crew manifest as a PDA cartridge program ( #18498 )
...
Co-authored-by: Phill101 <holypics4@gmail.com>
2023-08-05 10:37:08 +02:00
router
f97a2dbb13
make ringtone and uplink code 6 notes long ( #17545 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-03 21:13:16 +10:00
MishaUnity
e4dcdc0c6e
convert News read tab to PDA Cartridge ( #18368 )
...
* Add Console, PDA news tab, and ringstone popup
* Add English localization
* Add mass-media console board to Advanced Entertainment resrarch
* Fix misprint
* Deleting unused libraries
* Fix round restart problem
* Fixing restart problem
* Just another fix
* Сode optimization
* Code optimization
* Convert News read tab to cartridge
Convert the News read tab into a cartridge, and fix a couple of bugs
* Just another fix
* Some updates
* More fixing!!
Fix cooldown, add author label to read menu
* Again, fix cooldown bug
* Some minor changes
* Revert "Some minor changes"
This reverts commit 470c8d727629ac79994f70e56162adae8659e944.
* Some minor updates
2023-07-28 13:59:03 -06:00
MishaUnity
325d2a39ee
add mass-media system ( #18251 )
...
* Add Console, PDA news tab, and ringstone popup
* Add English localization
* Add mass-media console board to Advanced Entertainment resrarch
* Fix misprint
* Deleting unused libraries
* Fix round restart problem
* Fixing restart problem
* Just another fix
* Сode optimization
* Code optimization
2023-07-26 12:49:38 -06: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
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase ( #17335 )
2023-06-15 11:44:28 +10:00
TemporalOroboros
fdbf5b86f2
Removes linter warnings from the PDA module ( #17097 )
2023-06-08 00:22:19 +10:00
Daniil Sikinami
7ca7272a80
Add to PDA alert level, shift duration, instructions and ID access. Also fix uknown station name. ( #15220 )
...
* PDA update and fix
* fix alert level
* Fix color level
* Maybe this will look better
* PDA update and fix
* fix alert level
* Fix color level
* Maybe this will look better
* Now threat color is taken in the same way as for emergency lamps
* Minor improvements
* Fix alert level string
* AlertLevelChangedEvent for all PDAs
* StationAlert is also stored in PDAComponent
* Removed IdAccessLevels
* Removed Access from PDAMenu.xaml.cs and Draw time real-time
* AlertLevel updated from AlertLevelChangedEvent
* Removed garbage
* Removed garbage from PDAUpdateState.cs
* Change comp-pda-ui-station-time
* revert rename PDAOwnerInfo to PdaOwnerInfo
* remove not use short names jobs
* "ftl var should be lowercase"
* "ftl var should be lowercase" again
* transfer StationAlert to PDAIdInfoText
* transfer StationAlert to PDAIdInfoText
* Line breaks of parameter/argument lists conventions
* not randomly inline property attributes
* no broadcast AlertLevelChangedEvent
* fix cctualOwnerName
* GridModifiedEvent never called
* add alert-level-unknown-instructions
* UpdateAlertLevel for latejoin
* Add alert-level-unknown
* Revert "GridModifiedEvent never called"
This reverts commit fa7d1620
* remove garbage and fix quite long
2023-05-17 14:35:40 -06:00
deltanedas
a5aa4196a4
add lock uplink button ( #15994 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-02 17:53:10 +10:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +10:00
AJCM-git
0685611e18
Fixes PDAs dissapearing when inhand ( #13966 )
2023-02-06 15:53:24 -04:00
TemporalOroboros
b95f4f474b
Resolves PDAVisualizer is Obsolete ( #13896 )
2023-02-05 14:34:54 -04:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
metalgearsloth
02aef68dff
Remove ISpriteComponent ( #13458 )
2023-01-15 13:38:53 +11:00
Julian Giebel
e11cf969fa
PDA UI refactor and cartridges ( #11335 )
...
* Work on cartridges
* Work on PDA UI
* Work on PDA UIs program list
* Work on PDA UI borders
* Add DeviceNetworkingComponent to the pda base prototype
* Fix submodule version
* Fix cartridge loader ui key
* Fix pda menu xaml
* Implement relaying ui messages
* Finish implementing the notekeeper cartridge
* Fix submodule version
* Fix errors from merging master
* Fix test failing
* Implement setting preinstalled programs
* Add some documentation to CartridgeLoaderSystem
* Add more doc comments
* Add localization to program names
* Implement review suggestions
* Fix background programs receiving events twice when active
2022-11-08 14:00:20 -06:00
