Commit Graph

439 Commits

Author SHA1 Message Date
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
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
ActiveMammmoth
9fad86342f Wizard Staff of Animation (#34649) 2025-02-12 23:46:02 -05:00
SpaceManiac
d849a0434b Fix character menu button not untoggling when window closes (#33712) 2025-02-11 11:45:52 +11:00
metalgearsloth
96cb951555 Tweak viewport nullspace check (#35037)
* Tweak viewport nullspace check

WorldPos being 0,0 is sussy-a.

* a
2025-02-10 12:58:05 +01:00
TemporalOroboros
3b3c286669 Purges the one remaining use of TransformComponent.WorldPosition in content. (#34943) 2025-02-10 22:40:25 +11:00
metalgearsloth
e971d6e077 Revert engine reverties (#34968) 2025-02-08 17:17:55 +11:00
Errant
fc80a18c35 Revert "Storage UI V2 (#33045)"
This reverts commit fd25dac720.
2025-02-05 14:13:06 +01:00
Errant
d6a9ddd9e0 Revert "Storage sidebar fix (#34680)"
This reverts commit 3e091c4dfa.
2025-02-05 14:12:52 +01:00
Pupchansky
1c7c8dd82b Полный фикс ошибок апстрима + АПСТРИМ 2025-02-03 08:48:35 +05:00
metalgearsloth
3e091c4dfa Storage sidebar fix (#34680) 2025-01-28 10:09:52 +11:00
Coolsurf6
012c835559 Added Pain Numbness Trait (#34538)
* added pain-numbness component and system

* added numb as a trait that pulls the pain numbness component

* removed new event as mob threshold event as already being fired

* checked for MobThresholdsComponent first before running VerifyThresholds

* refacted force say to using LocalizedDatasetPrototype and added numb messages

* added severity check alert

* added comment for BeforeForceSayEvent

* removed space formatting

* changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb

* changed prefix damage-force-say-numb to 5 (whoops)
2025-01-27 11:34:20 +01:00
metalgearsloth
fd25dac720 Storage UI V2 (#33045) 2025-01-27 21:29:51 +11:00
c4llv07e
4809ee25ff Add option to disable bwoink sound. (#33782)
* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one
2025-01-17 10:24:50 +03: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
Myra
6041c828de Remove baby jail (#34443)
* Remove baby jail

Closes #33893

* Test fail fix.
2025-01-15 22:08:15 +01:00
Morb0
6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Telephone/TelephoneSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Chemicals.xml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2025-01-12 19:59:31 +03:00
Errant
46d58bf22a Role Types (#33420)
* mindcomponent namespace

* wip MindRole stuff

* admin player tab

* mindroletype comment

* mindRolePrototype redesign

* broken param

* wip RoleType implementation

* basic role type switching for antags

* traitor fix

* fix AdminPanel update

* the renameningTM

* cleanup

* feature uncreeping

* roletypes on mind roles

* update MindComponent.RoleType when MindRoles change

* ghostrole configuration

* ghostrole config improvements

* live update of roleType on the character window

* logging stuff and notes

* remove thing no one asked for

* weh

* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* move roletypeprototype to its own file, minor note stuff

* remove Roletype.Created

* log stuff

* roletype setup for ghostroles and autotraitor reinforcements

* ghostrole type configs

* adjustable admin overlay

* cleanup

* fix this in its own PR

* silicon antagonist

* borg stuff

* mmi roletype handling

* spawnable borg roletype handling

* weh

* ghost role cleanup

* weh

* RoleEvent update

* polish

* log stuff

* admin overlay config

* ghostrolecomponent cleanup

* weh

* admin overlay code cleanup

* minor cleanup

* Obsolete MindRoleAddedEvent

* comment

* minor code cleanup

* MindOnDoGreeting fix

* Role update message

* fix duplicate job greeting for cyborgs

* fix emag job message dupe

* nicer-looking role type update

* crew aligned

* syndicate assault borg role fix

* fix test fail

* fix a merge mistake

* fix LoneOp role type

* Update Content.Client/Administration/AdminNameOverlay.cs

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

* Update Content.Shared/Roles/SharedRoleSystem.cs

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

* comment formatting

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

* change logging category

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

* fix a space

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

* use MindAddRoles

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

* get MindComponent from TryGetMind

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

* move var declaration outside loop

* remove TryComp

* take RoleEnum behind the barn

* don't use ensurecomp unnecessarily

* cvar comments

* toggleableghostrolecomponent documentation

* skrek

* use EntProtoId

* mindrole config

* merge baserolecomponent into basemindrolecomponent

* ai and borg silicon role tweaks

* formatting

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

* I will end you (the color)

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

* use LocId type for a locale id

* update RoleEvent documentation

* update RoleEvent documentation

* remove obsolete MindRoleAddedEvent

* refine MindRolesUpdate()

* use dependency

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

* inject dependency

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

* roleType.Name no longer required

* reformatted draw code logic

* GhostRoleMarkerRoleComponent comment

* minor SharedRoleSystem cleanup

* StartingMindRoleComponent, unhardcode roundstart silicon

* Update Content.Shared/Roles/SharedRoleSystem.cs

* remove a whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-11 22:17:26 +01:00
Morb0
6106783f01 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	.github/labeler.yml
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/Names/arachnid_first.yml
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Prototypes/Datasets/Names/fake_human_first.yml
#	Resources/Prototypes/Datasets/Names/fake_human_last.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Datasets/Names/vox.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Mobs/Vox.xml
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
2024-12-26 00:30:02 +03:00
mosleyos
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
deathride58
5ab8e467a5 Adds an introductory message to the user-facing ahelp chat window (#33348)
* Adds an introductory message to the user-facing ahelp chat window

* Update Resources/Locale/en-US/administration/bwoink.ftl

* Update Resources/Locale/en-US/administration/bwoink.ftl

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-12-09 09:54:23 +01:00
Errant
0c4dd9d1b9 Revert "Simplify separated screen top menu (#33047)" (Stable -> Master) (#33785) 2024-12-08 22:14:34 +01:00
Vasilis The Pikachu
8472603b76 Revert "Simplify separated screen top menu (#33047)"
This reverts commit f27fa1ed30.
2024-12-08 21:36:48 +01:00
SpaceManiac
20be8298b7 Organize the Sandbox Panel window (#33684)
* Organize Sandbox Panel

* Map Editing -> Editing

* Unset ToggleMode on Suicide button. Can hardly un-suicide, no?

* Remove 'Link machines' button that has done nothing for 3 years

* Remember Sandbox window's position instead of forcing to center

* Shows Spawns -> Show Spawns

* Remove SandboxSystem.MachineLinking
2024-12-07 19:13:56 +01: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
Plykiya
450bf813b8 Fix for inspecting entities in hand (#33642)
Actually inspect entity in hands
2024-11-30 17:14:39 +01:00
Intoxicating-Innocence
d5225d1f46 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
2024-11-26 09:28:31 +01:00
metalgearsloth
f27fa1ed30 Simplify separated screen top menu (#33047) 2024-11-26 01:59:34 +01:00
Nikolai Korolev
ea7f5433ac Fix RA0003 warning for ChatBox (#33531) 2024-11-25 22:53:12 +11:00
Pupchansky
488cadd0a8 апстрим 2024-11-23 18:39:01 +05:00
SlamBamActionman
89392e2424 Remove drag & drop dropping items from containers (#32706)
* Initial commit

* Update based on maintainer discussion

* Forgot to remove this woops
2024-11-20 12:00:38 +11:00
Morb0
2deb2ac88b Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/service_worker.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/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-08 17:29:34 +03:00
MilenVolf
cc3a19c212 Collapsible ghost roles menu (#32717)
* Make ghost roles collapsible

* Save `BodyVisible` state of each `Collapsible` box

* Make ghost role collapsible only when group has more than 1 role

* Make it a little prettier

* Make only ghost role buttons collapsible

* Apply requested changes

* Typo

* Small cleanup

* Store in list, instead of iterating

* Make unique ids more unique

* Move it out of the cycle

* Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names

Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too.

* Put TODO in GhostRolesEui. I guess Issue must be made for this

* Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed

I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit.

* Remove extra space from ghost roles window

* Add buttons stretching. Size 3:1
2024-11-04 01:49:42 +01:00
Pupchansky
fcde1c14a1 апстрим 2024-10-08 22:05:52 +05:00
Morb0
3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
eoineoineoin
a8982b88af Allow users to drag-reorder action bar (#32552)
* Avoid rebuilding all buttons on action state change

Allows for drag events to continue when actions change

* Remove excess action buttons

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-03 16:01:01 +02:00
Pupchansky
cfb9cb54d0 Merge branch 'master' of https://github.com/corvax-nexus/ss14-wl 2024-09-09 14:48:09 +05:00
Pupchansky
7deb4a3627 Сервер апи апдейт 2024-09-06 22:18:48 +05:00
Pupchansky
eeac48430f ups 2024-09-06 11:35:40 +05:00
Morb0
0f339baab5 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
Winkarst
88dcc831c1 Remove calls to FormattedMessage obsolete methods (#31706)
* Remove FormattedMessage obsolete methods

* Oops
2024-09-01 13:00:53 +02: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
12rabbits
367cdfd439 Make guidebook remember where you left off (#31375)
* Guidebook tracks last read entry

* Persistent guidebook fixes

* Persistent guidebook requested changes

* Update Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-08-27 01:06:54 +02:00
Pupchansky
578a39d1b1 Апстрим 2024-08-25 18:54:10 +05:00
metalgearsloth
2e029a7d5b Action stuff (#31305)
* Action stuff

- Cleanup some event stuff
- Avoid dirtying entity unnecessarily
- Add ActionGrant as an easy way to apply / remove actions via compregistry.

* Fix merge
2024-08-25 22:43:31 +10:00
metalgearsloth
948bb726de Run actions on press (#31191)
I know UI generallys want to do stuff on key-up not key-down. With that being said the delay on release for these is noticeable.
e.g.
ActivateInWorld / UseInHand / any in-world interactions are on-press. This is especially noticeable if you have the same event on action + verb.
2024-08-25 22:36:22 +10:00
SlamBamActionman
61a1e89339 Add codeword highlighting (#30092)
* Added codeword highlighting

* Updated to support more codeword roles, color is set serverside

* Review feedback

* Change to a Component-based system using SessionSpecific

* Tidied up CanGetState, set Access restrictions on component

* Clean-up

* Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
2024-08-23 11:14:38 +02:00
Morb0
07a34aaaae Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +03:00
metalgearsloth
f7e08ec343 Station AI overlay (#31335)
Split
2024-08-22 23:13:47 -06:00
metalgearsloth
6553fd3d6e Fix inventory GUI for non-inventory entities (#31306)
Default to invisible and only set visible if itemslots gets initialised.
2024-08-22 13:05:17 -04:00