Commit Graph
110 Commits
Author SHA1 Message Date
tauandGitHub 7713152554 Add sponsors color (#551) 2026-04-15 16:19:36 +03:00
Charlotte Tezuka e6f8178511 Merge remote-tracking branch 'corvax/master' into upstream 2026-04-10 22:15:40 +02:00
LitoginandGitHub d806e64da5 Updare StationRecords (#478)
* commit init

* migration data base

* update DataBase

* Fix UI records

* Update records

* Print Init

* PrintUpdate

* fix

* language Add
2026-03-01 17:47:16 +03:00
Dmitry d7704cb9cb merge remote wizden/master 2026-01-24 00:55:41 +07:00
Pieter-Jan BriersandGitHub 29b7fc4463 Stable to master (#42599)
Ban database refactor (#42495)

* Ban DB refactor seems to work at a basic level for PostgreSQL

* New ban creation API

Supports all the new functionality (multiple players/addresses/hwids/roles/rounds per ban).

* Make the migration irreversible

* Re-implement ban notifications

The server ID check is no longer done as admins may want to place bans spanning multiple rounds irrelevant of the source server.

* Fix some split query warnings

* Implement migration on SQLite

* More comments

* Remove required from ban reason

SS14.Admin changes would like this

* More missing AsSplitQuery() calls

* Fix missing ban type filter

* Fix old CreateServerBan API with permanent time

* Fix department and role ban commands with permanent time

* Re-add banhits navigation property

Dropped this on accident, SS14.Admin needs it.

* More ban API fixes.

* Don't fetch ban exemption info for role bans

Not relevant, reduces query performance

* Regenerate migrations

* Fix adminnotes command for players that never connected

Would blow up handling null player records. Not a new bug introduced by the refactor, but I ran into it.

* Great shame... I accidentally committed submodule update...

* Update GDPR scripts

* Fix sandbox violation

* Fix bans with duplicate info causing DB exceptions

Most notably happened with role bans, as multiple departments may include the same role.
2026-01-23 15:34:23 +01:00
Dmitry 17ca2dfc3e merge remote wizden/master 2026-01-22 01:52:20 +07:00
8cf744ec55 Visual nubody (humanoid appearance refactor) (#42476)
* initial visual nubody

* oops overlay

* im so pheeming rn

* conversion...

* tests

* comeback of the underwear

* oops eyes

* blabbl

* zeds

* yaml linted

* search and visible count constraints

* reordering

* preserve previously selected markings colors

* fix test

* some ui niceties

* ordering

* make DB changes backwards-compatible/downgrade-friendly

* fix things again

* fix migration

* vulpkanin markings limit increase

* wrapping

* code cleanup and more code cleanup and more code cleanup and more code cleanup and

* fix slop ports

* better sampling API

* make filter work + use the method i made for its intended purpose

* fix test fails real quick

* magic mirror cleanup, remove TODO

* don't 0-init the organ profile data

* remove deltastates

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-20 07:07:53 +00:00
tauandGitHub b3a1bd3703 Hotfixes (#465) 2026-01-18 12:21:30 +03:00
ZekinsandGitHub adc7478264 Система навыков (#324)
* skills

* engine

* fix

* fixtests
2025-10-19 18:38:40 +03:00
Vasilis The Pikachu 5100068a78 Revert "Admin Log Browser Improvements (#39130)"
This reverts commit f67cebf7a4.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
2025-08-31 17:50:37 +02:00
SouthbridgeandGitHub f67cebf7a4 Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
ZekinsandGitHub ea7983f62e addrecords (#206) 2025-08-17 12:38:16 +03:00
ssdaniel24 d399099102 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
Conflicts:
   Content.Client/Humanoid/HumanoidAppearanceSystem.cs
   Content.Client/LateJoin/LateJoinGui.cs
   Content.Client/Stylesheets/StyleNano.cs
   Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
   Content.Server/Fax/FaxSystem.cs
   Content.Server/GameTicking/GameTicker.Spawning.cs
   Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
   Content.Server/Station/Systems/StationSpawningSystem.cs
   Content.Shared.Database/LogType.cs
   Content.Shared/Ghost/GhostComponent.cs
   Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
   Content.Shared/Preferences/HumanoidCharacterProfile.cs
   Content.Shared/Roles/SharedRoleSystem.cs
   README.md
   Resources/ConfigPresets/Corvax/common.toml
   Resources/Credits/GitHub.txt
   Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
   Resources/Maps/Shuttles/trading_outpost.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
   Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
   Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
   Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
   Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
   Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
   Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
   Resources/Prototypes/Entities/Structures/Power/substation.yml
   Resources/Prototypes/GameRules/cargo_gifts.yml
   Resources/Prototypes/GameRules/events.yml
   Resources/Prototypes/GameRules/meteorswarms.yml
   Resources/Prototypes/Maps/bagel.yml
   Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
   Resources/Prototypes/Reagents/chemicals.yml
   Resources/Prototypes/Reagents/medicine.yml
   Resources/Prototypes/Reagents/pyrotechnic.yml
   Resources/Prototypes/Reagents/toxins.yml
   Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
   Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
   Resources/Prototypes/Roles/Jobs/Command/captain.yml
   Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
   Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
   Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
   Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
   Resources/Prototypes/Roles/Jobs/Science/research_director.yml
   Resources/Prototypes/Roles/Jobs/Security/detective.yml
   Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
   Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
   Resources/Prototypes/Roles/Jobs/Security/warden.yml
   Resources/Prototypes/Voice/disease_emotes.yml
   Resources/Prototypes/Voice/speech_emotes.yml
   Resources/Prototypes/radio_channels.yml
   Resources/Textures/Effects/speech.rsi/meta.json
   Resources/Textures/Interface/Default/Slots/id.png
   Resources/Textures/Interface/Minimalist/Slots/pda.png
   Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
   Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
   RobustToolbox
2025-06-02 12:30:02 +03:00
Dmitry a6ecbc3410 Merge remote-tracking branch 'upstream/master' 2025-05-24 22:35:13 +07:00
YotaXPandGitHub 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
LEVELcat 7fa1a88740 Add Tajara to Tajaran migrations 2025-05-06 21:24:48 +03:00
LEVELcat 1d4ba544cc Merge branch 'fixUPWL3' of https://github.com/Litogin/Ho
# Resolved Conflicts:
#	Content.Client/Sprite/ContentSpriteSystem.cs
#	Content.Server/Corvax/StationGoal/StationGoalCommand.cs
#	Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Silicons/Borgs/BorgSystem.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Audio/Magic/attributions.yml
#	Resources/Changelog/ChangelogSyndie.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/ru-RU/guidebook/guides.ftl
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
#	Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Entities/Structures/Power/apc.yml
#	Resources/Prototypes/Entities/Structures/Power/substation.yml
#	Resources/Prototypes/Research/experimental.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png
2025-04-05 16:17:55 +03:00
LEVELcat 06e0b9731d Migrations fix
пофиксил миграции путём... комментирования кода?
ахуенно да
2025-04-01 20:30:06 +03:00
lzk228 0af3e04fd8 Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Doors/Systems/AirlockSystem.cs
#	Content.Server/Holopad/HolopadSystem.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/amber.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/convex.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/plasma.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
#	Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/candle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
#	Resources/Textures/Objects/Storage/boxes.rsi/clown.png
#	Resources/Textures/Objects/Storage/boxes.rsi/darts.png
#	Resources/Textures/Objects/Storage/boxes.rsi/disk.png
#	Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
#	Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
#	Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
#	Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
#	Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
#	Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
#	Resources/Textures/Objects/Storage/boxes.rsi/headset.png
#	Resources/Textures/Objects/Storage/boxes.rsi/heart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/holo.png
#	Resources/Textures/Objects/Storage/boxes.rsi/implant.png
#	Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
#	Resources/Textures/Objects/Storage/boxes.rsi/internals.png
#	Resources/Textures/Objects/Storage/boxes.rsi/latex.png
#	Resources/Textures/Objects/Storage/boxes.rsi/light.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
#	Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meson.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pda.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/swab.png
#	Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
#	Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/vials.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
#	Resources/Textures/Objects/Tiles/tile.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
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
Pupchansky 1c7c8dd82b Полный фикс ошибок апстрима + АПСТРИМ 2025-02-03 08:48:35 +05:00
Morb0 996b761d80 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Packaging/ClientPackaging.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	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-16 13:37:26 +03:00
Pieter-Jan BriersandGitHub c2e050ced0 Persist deadmin to database, add admin suspension system (#34048) 2025-01-15 00:46:45 +01:00
Morb0 f8f0dcb59e Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
2025-01-12 23:13:13 +03:00
96d913b147 Add IPIntel API support. (#33339)
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-01-12 20:41:26 +01:00
+89 049ba95a0d Upstream sync (#65)
* or was it

* S: Awaiting Changes

* Temporarily make singularity a bit harder to loose as non-antag

* Fix Fluent string ID copypaste fail

* Fix the component defaults

* Changes + Cleanup

* Reduced cost of coloured light fixtures

* Bump the failsafe timer down

* Increase softcap back to 80 (#33400)

* Toggle clothing fix (#32826)

* toggle clothing fix

* some adding

* Automatic changelog update

* .NET 9 forward compatibility changes (#33421)

This doesn't switch the projects over to .NET 9, but it does make them work on .NET 9 when we decide to switch in the future.

* Fix security riot crate (#33415)

* move riot crate from security to armory category

* Move riot crate to armory, actually make it require armory access to unlock

* Localize planet dataset names (#33398)

* Localize planet names (borer)

* DatasetPrototype -> LocalizedDatasetPrototype

* Apply requested changes

* Automatic changelog update

* Remove drag & drop dropping items from containers (#32706)

* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops

* Automatic changelog update

* Automatically add "Approved" to maintainer PRs (#33337)

* Add an Approved labeler for maintainer PRs

* Be extra safe with conditions

* Crew monitoring crate updated to contain flatpacks, science access instead of engi (#33417)

* Make a crew monitoring crate with flatpacks

* fix image

* migration

* Automatic changelog update

* Add emag functionality

* Move some of the new singularity code into shared

Hopefully without explosions yay

* Fix toggle verbs (#32138)

First commit

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Construction menu grid view (#32577)

* button

* implement populate grid view

* tweak min width

* Make grid button toggle visible

* tweak min window size

* fix missing recipe button when mirroring item

* make grid buttons toggleable

* align button texture vertically

* selected grid item has plain color background

* tweak window width so all buttons look good

* rename select method, defer colouring

* get icon better

* whoops

* simpler button toggle

* spritesys frame0, move spritesys

* delete old sprite system refs

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Actually make the emagging popup work properly

* Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared

* Fix imports

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Set airlock unlit layers as invisible (#32484)

Doesn't really affect anything due to appearance bulldozing this but this aligns with their actual normal states so.

* Update salvage.yml

* Update cargo_vending.yml

* Update salvage.yml

* Update salvage.yml

* Update to Robust v237.2.0

* Syndicate item fix ups (#33435)

tweaks and fixes

* Coal presents and chrimmas tree options. Presents no longer itemify (#33147)

* Dont ensure ItemComp because it could lead to weirds, and also PickupOrDrop handles non-items already.

* presents and tree

* woops

* reviews a

* Automatic changelog update

* Fix approval labeler (#33440)

* Fix approval labeler

* Update labeler-review.yml

* Update labeler-review.yml

* electrification hud

* Fix admin ghosts not being able to see items in pockets or interact with them (#31076)

* Fix admin ghosts not being able to see items in pouches or interact with them

* fix

* oops

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Gas pipe sensors (#33128)

* Initial commit

* Monitored pipe node is now referenced by name

* Review changes

* Simplified construction

* Tweaked deconstruction to match other binary atmos devices

* Helper function removal

* Updated attribution

* Automatic changelog update

* Add telegram to the server info-links (#33459)

* Fix sandbox error with new HWID code. (#33461)

Oops

* cleanup

* rename

* another rename

* baby proof the terminal (#33281)

* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* Disable submit admin note button on switch to note (#33456)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Fix startingGear storage (#33394)

* fix starting gear storage

* removal of unused

---------

Co-authored-by: MetalSage <metalsage.official@gmail.com>

* Minor improvements & fixes to Shuttle Console UI (#31623)

* Fix grids and docks being culled from display prematurely

* Fix inconsistent disabling of "Undock" buttons

* Add a radar icon to indicate where the controlling console is

* Tidy up math

Remove lots of sketchy transforms-of-transforms, which should have been
as single matrix multiply. Assign proper names to matrices. Remove some
redundant calculations.

* Feedback

* Fix door animations mispredicting if closing is interrupted (#33481)

* Fix door animations mispredicting if closing is interrupted

On master it will flicker states a little bit partially due to it not being predicted.

Instead we'll just set it straight back to opening (no animation is ever played anyway).

* no log

* Automatic changelog update

* Don't show drag-drop outline if climbing (#33477)

It won't actually do anything.

* Automatic changelog update

* Ensure wires can always be cut (#32447)

ensure wires are always cut

* Automatic changelog update

* babyproof arrivals shuttle (#33284)

* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Add delay to AutoOrient (#33479)

It functions identically to how V1 of orientation worked and it's incredibly annoying.

* Automatic changelog update

* Update Credits (#33503)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Draw muzzle flash below mobs (#33465)

* Draw muzzle flash below mobs

* Better naming

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Allow shuttles on planets to make FTL jump (#33507)

This check conflicts with an attempt to FTL from the planet before expedition ends

* Automatic changelog update

* fix exped caves generation (#32890)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Automatic changelog update

* various material & ore inhands (#33342)

* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* pyrottOn

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Delete HOS headset from warden's locker (#33234)

* add headset

* Add icons

* Meta change

* fix

* Revert + delete headset from locker

* RCD icons resprite (#2800)

* fix airlocks inconsistently auto-closing after unbolting (#33524)

fix door auto close timer

* Automatic changelog update

* baby proof the terminal (#33281)

* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again

* babyproof arrivals shuttle (#33284)

* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* [BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529)

* fix bug, in ghost command lobby

* fix

* Fix build

* Automatic changelog update

* removed obsolete netmessage creator (#33542)

removed opsolete netmessage createor

* Fix RA0003 warning for ChatBox (#33531)

* Shark plushies now goes rawr on hit. (#33540)

Shark goes rawr more

* Automatic changelog update

* Turn off PointLights on VendingMachines when broken or off. (#33513)

The light itself should already turn off due to `LitOnPowered`
component, but the broken state of a VendingMachine did not.

Fixes  #33382

* Automatic changelog update

* Adds more diona names (#33066)

* adds more diona names

* more stuff

* AHHHHHHHHHHHHHHHHHHHHHHH

* further additions

* removes depression + adds comment

* fixes + remove some weird stuff + more stuff

* remove haste

* minor AI cleanup (#33555)

* minor cleanup

* to

* Simplify separated screen top menu (#33047)

* Automatic changelog update

* [Maps] Maus Winter Update (#2803)

* [MAPS] Paper tweak (#2804)

* Automatic changelog update

* Ghost role drop-down alignment (#33397)

* dropdown shares margin width with children

* removed dependency that rider added for some reason

* reduced vertical margin from 8 to 2

* Greytide Virus station event (#33547)

* proof of concept

* full implementation

* I commited a crime

* t

* min players increase

* Make shuttle airlocks not snapcardinals (#33557)

* Make shuttle airlocks not snapcardinals

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* [MAPS] Avrite winter (#2806)

* Added two N2 lockers to Reach (#33409)

Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com~>

* Hotfix the randomly occurring DeleteAllThenGhost test failures (#33582)

* clear mindrole on component shutdown

* let it go

* Fix space ambient music (#33594)

* Automatic changelog update

* Fix windoor and high security door not showing electrocution HUD (#33551)

* Automatic changelog update

* [Maps] Awesome new god update (#2811)

* [Maps] Avrite minor change (#2810)

* Automatic changelog update

* Removes burnt tiles (#33422)

remove burnt tiles

* Parallax pack 2 (#2813)

* Added Oppenhopper poster to the game. (#33588)

* o7

* -

* oppenhopper v2

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

* Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix version for electril_grill meta.json (#33611)

fix

fixing the version thing in meta json for electril grill textures

Co-authored-by: Arthur Kustenko <arthur.kustenko@learnet.se>

* Fix gauze eyepatch flying pixel (#33564)

boo

* Fix swapped uniform printer east/west sprites (#33442)

Fix uniform printer sprites rotating the wrong way

* Makes knives fly straight when thrown (#33615)

Gives knives a thrown angle

* Light verb is now predicted (#33622)

Fix

* Automatic changelog update

* Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (#33559)

Update Content.PatreonParse to use net8.0 targetframework

* Approval labeler fix electric boogaloo (#33633)

Nik told me to not name this "nya"

* Fix gender, maybe (#33631)

Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>

* Display GPS coordinates on their own line (#33625)

* Automatic changelog update

* Remove grasshopper from the panic bunker message (#33638)

Can be retargetted to stable if preferred, which will then be a hotfix

* Add admin log for ghost warping (#33636)

* Automatic changelog update

* Rename nitrogen internals crate (#33545)

* rename nitrogen internals crate

* nitrogen internals crate description

* migrate CrateNitrogenInternals ID

* Automatic changelog update

* Cleanup some Client atmos systems (#33634)

* Cleanup `ScrubberControl.xaml.cs`

* Minor cleanups

* Another pile of minor cleanups

* Apply requested changes

* Rename "which" into "bound". Add whitespace after "if"

* Fix for arrivals deleting nuke (#33659)

Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>

* Automatic changelog update

* add locale to Shuttle Console Map tab (#33651)

fixed

* Automatic changelog update

* fix PermanentBlindnessComponent to be not so permanent (#33292)

* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>

* Cog/Marathon: Airlock fixes (#33621)

* Fixes the TEG airlock on marathon

* Fixes the atmos external airlock on cog

* Automatic changelog update

* Revert "Rebalancing zombie mode chances" (#2818)

* Automatic changelog update

* [Maps] Silly Winter Update (#2809)

* [Maps] Pilgrim update #7 — Winter (#2821)

* Fix for handcuffing someone more than once (#33646)

* Fix for over-cuffing someone

* comment

* Automatic changelog update

* Fix for inspecting entities in hand (#33642)

Actually inspect entity in hands

* Automatic changelog update

* Fix for inspecting entities in the stripping window (#33644)

Handle it

* Automatic changelog update

* Fix borgs not getting names on roundstart (#33578)

* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Require Wield To Activate Double-bladed ESword (#32869)

* Add MeleeRequiresWield component

* Prevent world activation

* Automatic changelog update

* Fix makeghostroleraffle command where 4 arguments (#31836)

Fix makeghostroleraffle command with 4 arguments

* Automatic changelog update

* Update Credits (#33670)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Fix formatting IDE0055 warnings in VS Code (#33669)

* Replace obsolete GetTilesIntersecting methods (#32455)

* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`

* delta winter (#2824)

* Update Snowasis (#33364)

* Update Snowasis

* Appease test gods

* Woops had the leftward animation backwards. Fixed.

* add santa suits and envelopes to chapel

* It looks worse unscaled but whatever.

* fix ghost role

* examines

* Automatic changelog update

* [MAPS] Paper Cristmass update (#2822)

* Fix wrong system usage (#33679)

Fix wrong system using

* resprite new year nuke (#2825)

* Fix BuckleSystem always marking InteractHandEvent as Handled (#33602)

* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Touching up Bagel Security Brig (#33680)

* Touching up Bagel Security Brig

* Added a few missing door names

* Last door name I promise

* Address feedback

* Forgot to delete old shutter button

---------

Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com~>

* [Maps] Tushkan update #3 — Winter (#2826)

* Map pool tweak (#2827)

* Fixed ghost role rules for some syndicate familiars (#32457)

* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Automatic changelog update

* Fix lobby countdown not showing hours (#33685)

* New Low-Mid Pop Station - Amber Station  (#33441)

* Initial Commit with two departments done

* Checkpointing work

* Added most of service and science

* Started work on medbay

* Modified TEG setup and set up atmos pipes for engineering

* Re-added medbay, added chapel and janitorial, started routing disposals and generally the final layout of the map is coming together

* Plenty of additions, too many to list in a commit message

* Major update

* Nearly done with the map, just have to do decals and emergency lights

* Added all decals, only thing missing is department signs

* Toned back the dirt decals a bunch, added hallway signs and other decorations

* Finishing touches on the map before testing.

* Fixed invalids

* Renamed the station to Amber, and made a couple adjustments

* Completely redid cargo, added maints around sec

* Added Amber to the map post init integration test

* Many small updates addressing issues.

* Ran a script to update all the camera names, also ran fixgridatmos, fixrotations, tilewalls, and variantize

* Started addressing some of the issues brough up by Emisse and others

* Addressed all issues mentioned by reviewers. Added mail system.

* Wrapped up meeting all the issues raised by reviewers, also did a bunch of testing and resolved issues found during those tests

* Addressed additional requested changes, and nabbed some ship designs from Frontier. Redesigned south east maints and surrounding meteor nets based off of those designs

* Making a couple more requested changes

* Reduced the amount of Nitrogen Closets, made several small adjustments. Ready for review again!

* Removed invalids!

* web edit lmao

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Automatic changelog update

* Makes kukri not use combat knife's storage sprite (#33661)

* Adds a morgue locked maints airlock (#33693)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Juiceable slimeballs (#33660)

adds extractable component to slimeball prototype

* Add missing nacho recipes (#33637)

* Nacho recipes, nutrition, and trash

In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos.

In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one.

* Volumes, nutritional tweaks, and flavor

In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me.

Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead.

In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.

* Automatic changelog update

* Amber Station Seasonal Update (#33698)

Made some modifications requested by reviewers prior to and after map merge, also added holiday decorations!

* [Maps] Pilgrim update #8 & Silly tweak (#2828)

* Amber Improvements (#33707)

* Various changes (see PR)

* variantized, fixedgridatmos, tiledwalls

* Fix sinks and toilets not draining (#33691)

* Fix AutoDrain

Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).

However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.

* Update documentation

* Automatic changelog update

* Fix layout on wires UI (#33714)

Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead.

Lights with less than 4 characters of text weren't aligned right, now they are.

* Automatic changelog update

* Fix for towels not having a cooldown for cleaning (#33700)

Added a delay to cleaning with the towel

* Add cooldown to buttons in borg's laws UI (#31490)

* Adds Store on Collide and Wand of the Locker (#33710)

* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID

* Automatic changelog update

* Update locale

* Fix upstream

* update server configs (#2799)

* Fix displacements map for female vulp and reptilian (#2832)

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Translate Upstream #2748 (#2837)

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* Перевод Upstream #2830  (#2836)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* translate borer names (#2835)

* [Localize] Poster 52 (#2840)

* Translate new diona names (#2839)

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* [Resprite] Medical uniforms & rollerbeds (#2802)

* Automatic changelog update

* Revert "new year lobbyscreens removed" (#2831)

* Surgeon spawnpoint (#2841)

Added to support map in corvax next
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* fix nukedisk chances (#2745)

* Adds surgeon spawnpoint on maps  (#2845)

* Winter stuff tweak (#2833)

* [MAPS] Silly Christmass Date  (#2854)

* [MAPS] Paper Christmass Date (#2853)

* [MAPS] Avrite New Year update (#2852)

* [Maps] Tushkan new year update (#2851)

* [Maps] Pilgrim new year update (#2850)

* [Maps] Maus new year update (#2849)

* [Maps] Awesome new year update (#2848)

* [Maps] Outpost return (#2847)

Co-authored-by: kvant8 <ar4477023rr.@gmail.com>
Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>

* [Maps] Astra new year update (#2844)

* Update corvax_delta.yml (#2856)

* [Maps] Pilgrim hotfix #2 (#2860)

* Resprite botany food (#2858)

* Fix spacelaw loadout (#2861)

* Make Jolene TTS voice female (#2834)

* Update configs (#2855)

* New Year Music (#2829)

* Revert "Удаление лимита времени для доступа к стартовым ролям." (#2652)

* Automatic changelog update

* Automatic changelog update

* [Maps] Glacier new year update (#2864)

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Saphire <lattice@saphi.re>
Co-authored-by: Justice League <the.justice.league.of.canada@gmail.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ArZarLordOfMango <96249677+ArZarLordOfMango@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: ThatGuyUSA <thatguyusa123@gmail.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: c4llv07e <igor@c4llv07e.xyz>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: MetalSage <74924875+MetalSage@users.noreply.github.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: goet <6637097+goet@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: mubururu_ <139181059+muburu@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: SonicHDC <100022571+SonicHDC@users.noreply.github.com>
Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Ben <benjaminevanownby@gmail.com>
Co-authored-by: Nikolai Korolev <CrafterKolyan@mail.ru>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Niels Huylebroeck <red15@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Meguneri <163569304+Meguneri@users.noreply.github.com>
Co-authored-by: TiFeRi <57865696+XsenonDash@users.noreply.github.com>
Co-authored-by: IanComradeBot <96892333+IanComradeBot@users.noreply.github.com>
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com>
Co-authored-by: CaptainMaru <124701378+CaptainMaru@users.noreply.github.com>
Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com>
Co-authored-by: dylanstrategie <188926747+dylanstrategie@users.noreply.github.com~>
Co-authored-by: Stubaretka24 <143966631+Stubaretka24@users.noreply.github.com>
Co-authored-by: AlexUm <159550239+AlexUm418@users.noreply.github.com>
Co-authored-by: Arthur Kustenko <arthur.kustenko@learnet.se>
Co-authored-by: Mifia <xzx._@outlook.com>
Co-authored-by: SpaceManiac <tad@platymuus.com>
Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Co-authored-by: Alpha-Two <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Alpha-Two <alpha2.5232@gmail.com>
Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
Co-authored-by: MossyGreySlope <mossygreyslope@gmail.com>
Co-authored-by: Gansu <68031780+GansuLalan@users.noreply.github.com>
Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com>
Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
Co-authored-by: compilatron <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Co-authored-by: Doctorjakes <122163951+Doctorjakes@users.noreply.github.com>
Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>
Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com>
Co-authored-by: Token <56667933+TokenStyle@users.noreply.github.com>
Co-authored-by: Nikolai Korolev <korolevns98@gmail.com>
Co-authored-by: Bloodcanis <113198922+Bloodcanis@users.noreply.github.com>
Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Co-authored-by: JIPDawg <JIPDawg93@gmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Luiz Costa <33888056+luizwritescode@users.noreply.github.com>
Co-authored-by: CheddaCheez <cheddacheezy@gmail.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: Tap <tapiocaphobe@gmail.com>
Co-authored-by: Hreno <hrenor@gmail.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Morb0 <14136326+Morb0@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Litogin <139079015+Litogin@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Co-authored-by: MureixloI <132683811+MureixloI@users.noreply.github.com>
Co-authored-by: kvant8 <163752943+kvant8@users.noreply.github.com>
Co-authored-by: kvant8 <ar4477023rr.@gmail.com>
Co-authored-by: lastPechkin <mevlyutov1958@gmail.com>
Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
2024-12-17 22:37:21 +03:00
Morb0 e76bb1fa57 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/Names/borer.yml
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Tiles/plating_burnt.png
2024-12-05 01:22:35 +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
Pupchansky cfb9cb54d0 Merge branch 'master' of https://github.com/corvax-nexus/ss14-wl 2024-09-09 14:48:09 +05:00
Pupchansky 67cf565222 Апдейт http апи сервера 2024-09-09 14:47:56 +05:00
Pupchansky eeac48430f ups 2024-09-06 11:35:40 +05:00
Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.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
#	SpaceStation14.sln
2024-08-28 16:40:36 +03:00
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
Pupchansky 25b587f834 Добавлена админ-команда для отключения проверки на возраст 2024-08-14 14:42:16 +05:00
Pupchansky f377f70b31 Sync with апстрим 2024-06-29 18:22:53 +05:00
Morb0 da333a1972 Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
2024-06-27 13:40:52 +03:00
Pieter-Jan BriersandGitHub 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
Pieter-Jan BriersandGitHub 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
ArRei d7e8d74f60 Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-06-10 05:57:10 +03:00
AJCM-gitandGitHub 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
NemanjaandGitHub 1333b48747 Convert rules to use guidebook parsing (#28647) 2024-06-06 03:11:26 -04:00
Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Commands/AdminWhoCommand.cs
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 23:06:19 +03:00
19be94c9ea Add job whitelist system (#28085)
* Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-06-01 05:08:31 -07:00
Pupchansky d8c5b62edd Added separate table for subroles 2024-05-04 13:18:03 +05:00
Pupchansky f3db604160 Sync with master and fixed merge conflicts 2024-05-03 23:15:20 +05:00
Pupchansky cba9b471a7 Added ability to choose other names for roles 2024-05-03 23:07:01 +05:00
Morbo 6eb3be96e6 Remove ERP :( 2024-05-03 02:17:03 +03:00
Pupchansky 7718d58394 Fixed minor test errors 2024-04-30 19:43:45 +05:00
Pupchansky 0da26b02a0 Fixed troubles with db again 2024-04-28 16:18:30 +05:00
Figleo bc64573556 Merge remote-tracking branch 'upstream/master' 2024-04-27 21:24:00 +03:00