VigersRay
6c158e6f0b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/ISSUE_TEMPLATE/config.yml
# .github/ISSUE_TEMPLATE/issue_report.md
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Destructible/Thresholds/DamageThreshold.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/VomitSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Armor/SharedArmorSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Content.Shared/Cabinet/ItemCabinetSystem.cs
# Content.Shared/Chat/SharedChatSystem.Emote.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Clothing/EntitySystems/MaskSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
# Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/IoC/SharedContentIoC.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Ninja/Components/NinjaSuitComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Revenant/Components/RevenantComponent.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/HitscanPrototype.cs
# Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs
# README.md
# Resources/Audio/Weapons/attributions.yml
# Resources/Locale/en-US/_strings/ghost/make-ghost-gui.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/statuseffects.ftl
# Resources/Locale/en-US/_strings/job/job-description.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/npc/hugbot.ftl
# Resources/Locale/en-US/_strings/npc/npc-debug.ftl
# Resources/Locale/en-US/_strings/speech/speech-triggers.ftl
# Resources/Locale/en-US/_strings/ui/stat-values.ftl
# Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
# Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
# Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
# Resources/Maps/Shuttles/cargo_relic.yml
# Resources/Maps/_Sunrise/Station/bagel.yml
# Resources/Maps/_Sunrise/Station/barratry.yml
# Resources/Maps/_Sunrise/Station/fland.yml
# Resources/Maps/_Sunrise/Station/marathon.yml
# Resources/Maps/_Sunrise/Station/oasis.yml
# Resources/Maps/_Sunrise/Station/packed.yml
# Resources/Maps/_Sunrise/Station/plasma.yml
# Resources/Maps/_Sunrise/Station/relic.yml
# Resources/Maps/_Sunrise/event/clon_mine.yml
# Resources/Maps/_Sunrise/event/void.yml
# Resources/Prototypes/Body/Prototypes/vox.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
# Resources/Prototypes/Recipes/Lathes/Packs/security.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/thief.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/wizard.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# 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/Civilian/mime.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/Stacks/Materials/crystals.yml
# Resources/Prototypes/Stacks/floor_tile_stacks.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
# Resources/migration.yml
# RobustToolbox
2025-10-19 17:38:04 +02:00
Partmedia
a6938a6442
Fix generating migrations with USE_SYSTEM_SQLITE ( #40910 )
2025-10-14 21:40:05 +00:00
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
Vigers Ray
a5a791ac95
фиксы-кокащек
2025-09-27 02:50:48 +03:00
UnilTan
c286124224
Попытка сделать адекватный градиент ( #3195 )
2025-09-27 00:50:02 +03:00
Vigers Ray
94a1f35e30
упс
2025-09-10 05:50:29 +03:00
Vigers Ray
85e6945d1c
мда, ебать его в рот
2025-09-10 05:43:53 +03:00
Copilot
aba00f7e8f
Implement Mentor Help System (MHelp) - Complete Ticket-based Help for Game Questions ( #2915 )
...
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-09-09 20:54:52 +03:00
Vasilis The Pikachu
5100068a78
Revert "Admin Log Browser Improvements ( #39130 )"
...
This reverts commit f67cebf7a4https://github.com/space-wizards/space-station-14/issues/39960 for further information
2025-08-31 17:50:37 +02:00
Vigers Ray
252e81c728
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Shared/Gravity/SharedGravitySystem.cs
# Content.Shared/Implants/SharedSubdermalImplantSystem.cs
# Resources/Locale/en-US/_strings/traits/traits.ftl
# Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
# Resources/Prototypes/Entities/Objects/Misc/implanters.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
Southbridge
f67cebf7a4
Admin Log Browser Improvements ( #39130 )
2025-08-21 22:12:16 +02:00
Ligyb
d1ed5109e2
градиенты волос ( #2652 )
2025-07-31 22:32:37 +03:00
RavMorgan
3ca950f883
Порт роста и веса ( #2657 )
...
Co-authored-by: Mona Hmiza <hmizahmizowna@hmiza.hmiza>
Co-authored-by: SplikZerys <tronezero700@yandex.ru>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-07-31 21:08:48 +03:00
Myra
2c4251dcdc
Revert "Don't compile EF Core designer files on release builds" ( #39057 )
2025-07-19 00:23:48 +02:00
Pieter-Jan Briers
27dc59a40b
Don't compile EF Core designer files on release builds ( #38927 )
2025-07-13 10:29:18 +02: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
YotaXP
e404e45ffc
Persist construction menu favorites server-side ( #35867 )
...
* Persist construction menu favorites to player profile
* Use `ProtoId`s for construction favorites
* Validate construction favorites updates from the client
* Actually await the async database call
2025-05-17 13:37:19 -04:00
Vigers Ray
b619ca174a
Ахелпы сохраняются в базе данных
2025-04-08 05:09:44 +03:00
SplikZerys
bdf87d104e
BODYTYPES ( #1493 )
...
Co-authored-by: lunarica <splatt.pr@gmail.com>
2025-02-28 13:28:18 +03:00
Vigers Ray
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
nikthechampiongr
09f75394be
Require hwid ( #35331 )
...
* Make cvar to require that the client has a modern hwid
* Ignore guests and don't disable cvar on dev
* Rename and add docs
2025-02-20 19:04:45 +01:00
Vigers Ray
53711110c3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/administration/commands/announce-command.ftl
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
2025-02-12 18:46:28 +03:00
metalgearsloth
15b28936df
Add loadout names ( #31303 )
...
* Add loadout names
Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.
* the box
* Spawning cherry pick
* Fix nit
* revert
* Final cleanup
* Real
* Name UI fix
* Migrations
* a
* Review
* Re-run migrations
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2025-02-11 18:30:24 +01:00
Vigers Ray
1b61551b4d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/Implants/SubdermalImplantSystem.cs
# Content.Server/Silicons/Borgs/BorgSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
# Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
2025-01-16 20:00:41 +03:00
Myra
6041c828de
Remove baby jail ( #34443 )
...
* Remove baby jail
Closes #33893
* Test fail fix.
2025-01-15 22:08:15 +01:00
Vigers Ray
d86ad2ba97
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-15 18:23:20 +03:00
Pieter-Jan Briers
c2e050ced0
Persist deadmin to database, add admin suspension system ( #34048 )
2025-01-15 00:46:45 +01:00
Vigers Ray
5c219f5105
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
# Resources/Locale/en-US/_strings/mind/role-types.ftl
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-01-14 18:46:45 +03:00
Myra
96d913b147
Add IPIntel API support. ( #33339 )
...
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-01-12 20:41:26 +01:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
Pieter-Jan Briers
4f3db43696
Integrate Modern HWID into content
...
This should be the primary changes for the future-proof "Modern HWID" system implemented into Robust and the auth server.
HWIDs in the database have been given an additional column representing their version, legacy or modern. This is implemented via an EF Core owned entity. By manually setting the column name of the main value column, we can keep DB compatibility and the migration is just adding some type columns.
This new HWID type has to be plumbed through everywhere, resulting in some breaking changes for the DB layer and such.
New bans and player records are placed with the new modern HWID. Old bans are still checked against legacy HWIDs.
Modern HWIDs are presented with a "V2-" prefix to admins, to allow distinguishing them. This is also integrated into the parsing logic for placing new bans.
There's also some code cleanup to reduce copy pasting around the place from my changes.
Requires latest engine to support ImmutableArray<byte> in NetSerializer.
2024-11-12 01:51:54 +01:00
Pieter-Jan Briers
36aceb178c
Database SnakeCaseNaming fixes
...
Fixes formatting of owned entity type property names. These are normally named "FooBar_Baz" by EF Core, but the snake case thing was turning them into "foo_bar__baz". The double underscore is now fixed.
We don't *yet* have any EF Core owned entity in use, but I am planning to add one. I don't know if downstreams are using any so this should still be marked as a breaking change.
Also fixed it creating and dropping a Compiled Regex instance for every name, the regex is now cached (and pregenerated).
2024-11-12 01:51:54 +01:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
Simon
f92ef41538
Automated whitelists ( #23985 )
...
* Beginnings of making the breadmemes jobs easier
* stuff
* stuff pt. 2
* Stuff pt.3
* Stuff I forgot last time
* Basic whitelist
Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist
* Remove always deny condition in favor of just breaking if playtime check fails
* Change default whitelist
Default whitelist is now the "legacy" whitelist.
* localization
* Admin check
* minor spelling change
* Fix build
* Whitelist message
* Fix vars not being datafield and spelling mistakes
* Minor spelling mistake
* Change config for salamander
* Reviews and stuff
* Add summaries
* Fix whitelists
* Forgot to add a datafield
* Fixing stuff I guess
* Reuse admin remarks to reduce load when connecting.
* Update log messages to be verbose instead of debug
* Reviews
* whoops
* Explain a bit more how whitelist checking works
* Apply CE's review
* Append Membership to Blacklist and Whitelist conditions
* Fix review comments
* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes
* Make note count field work
* Fix cvar for thingy
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-27 18:01:17 +02:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Julian Giebel
df95be1ce5
Kick on ban for entire server group ( #28649 )
...
* Start work on PostgresNotificationManager
Implement initial version of init and listening code
* Finish implementing PostgresNotificationManager
Implement ban insert trigger
* Implement ignoring notifications if the ban was from the same server
* Address reviews
* Fixes and refactorings
Fix typo in migration SQL
Pull new code in BanManager out into its own partial file.
Unify logic to kick somebody with that when a new ban is placed directly on the server.
New bans are now checked against all parameters (IP, HWID) instead of just user ID.
Extracted SQLite ban matching code into a new class so that it can mostly be re-used by the ban notification code. No copy-paste here.
Database notifications are now not implicitly sent to the main thread, this means basic checks will happen in the thread pool beforehand.
Bans without user ID are now sent to servers. Bans are rate limited to avoid undue work from mass ban imports, beyond the rate limit they are dropped.
Improved error handling and logging for the whole system.
Matching bans against connected players requires knowing their ban exemption flags. These are now cached when the player connects.
ServerBanDef now has exemption flags, again to allow matching full ban details for ban notifications.
Made database notifications a proper struct type to reduce copy pasting a tuple.
Remove copy pasted connection string building code by just... passing the string into the constructor.
Add lock around _notificationHandlers just in case.
Fixed postgres connection wait not being called in a loop and therefore spamming LISTEN commands for every received notification.
Added more error handling and logging to notification listener.
Removed some copy pasting from SQLite database layer too while I was at it because god forbid we expect anybody else to do all the work in this project.
Sorry Julian
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-20 23:31:33 +02: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
Chief-Engineer
6d664c9157
Add debug logs to baby jail and fix playtime logic ( #30158 )
...
* add debug logs
* Update Model.cs
* fix playtime logic for null playtime
* remove unnecessary condition
* either me or the compiler is having a C# skill issue
2024-07-21 01:28:43 +02:00
Chief-Engineer
6371a04621
Fix baby jail ( #29896 )
...
* Revert "Revert Baby Jail (#29891 )"
This reverts commit 24a2866747
2024-07-11 15:14:01 +10:00
Vasilis
24a2866747
Revert Baby Jail ( #29891 )
...
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763 )"
This reverts commit 3ceb92a0c4
2024-07-11 10:33:47 +10:00
VigersRay
8fedc6f64a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/migration.yml
2024-06-23 21:07:25 +03:00
Pieter-Jan Briers
0c34eb6138
Ban template system ( #29365 )
...
To help out admins, so they can easily fill out datacenter bans and stuff. Supports ban exemption flags and everything.
This is for use with SS14.Admin so it's just DB models here.
2024-06-23 17:33:54 +02:00
VigersRay
9fd0e0cff7
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-21 18:08:24 +03:00
Pieter-Jan Briers
f041f58a6d
Add time index to connection log ( #29281 )
...
* Add time index to connection log
Queries go nyoom.
* Don't let me code shit at 5 AM
2024-06-21 15:29:10 +02:00
nikthechampiongr
76a65c8e43
Implement BlacklistedRange exempt flag ( #29258 )
...
* Implement a new kind of ip range ban that only applies to new players
* Put determining whether a player record exists to its own function
* Make BlacklistedRange bans get bypassed by any ban exemption
* Stop trying to get another DbGuard while already having one
This does break with convention on the functions in that area but
considering the use of this function it's probably fine?
I could alternatively just move the place it's called from.
Also I was suppossed to wait for tests to finish locally just to be
sure, but nah. I am pushing this now
2024-06-21 14:06:07 +02:00
Vigers Ray
19ff7831b6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
2024-06-09 22:32:37 +03:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) ( #28763 )
2024-06-09 14:58:10 -04:00
Vigers Ray
d7b054c032
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
2024-06-09 00:50:47 +03:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars ( #28655 )
...
* Fixes client having authority over rules popup cvars
* Delete duplicate migration
* Pre-update
* Post-update
2024-06-07 21:53:20 +02:00
VigersRay
7d0476aab0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/Roles/JobPrototype.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
2024-06-07 11:28:58 +03:00
