LEVELcat
790070d410
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstreamAgain
...
# Resolved Conflicts:
# .github/workflows/publish.yml
# Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
# Content.Server/DetailExaminable/DetailExaminableystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/Store/Systems/StoreSystem.Listings.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Damage/Systems/StaminaSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Humanoid/Markings/MarkingCategories.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Directory.Packages.props
# Resources/Audio/Lobby/attributions.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
# Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Corvax/lobbyscreens.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/Species/reptilian.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Corvax/LobbyScreens/attributions.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-04-06 08:43:40 +03:00
Kill_Me_I_Noobs
7fd14e7a15
FixMerge
2025-04-05 22:38:19 +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
Ed
e6180da35c
Displacement Map Visualizer update ( #35952 )
...
Update Displacement Map Visualizer.lua
2025-04-05 15:51:59 +03:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
imcb
231847a36d
Fixes and refactoring to discord changelog script ( #33859 )
...
* Fixes and refactoring to discord changelog script
Upstreamed from https://github.com/impstation/imp-station-14/pull/1023
* Add some prints back in
2025-03-11 20:14:40 +01: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
Pieter-Jan Briers
360794eb3a
Publishing workflow for Vulture Test server ( #35009 )
...
* Publishing workflow for Vulture Test server
* Remove dep install from workflow
Not necessary since changelogs don't happen
2025-02-09 20:48:10 +01:00
Pupchansky
1c7c8dd82b
Полный фикс ошибок апстрима + АПСТРИМ
2025-02-03 08:48:35 +05:00
Pupchansky
69ae271a90
Фикс апстримов
2025-02-03 07:10:21 +05:00
Pupchansky
2b929585bb
Update publish_multi_request.py
2024-11-10 19:02:21 +05:00
Pupchansky
93b82301c3
Апстрим
2024-11-06 16:46:02 +05:00
Evgencheg
c6264ee41a
Fix locale scripts ( #2648 )
...
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com >
Co-authored-by: Morb0 <14136326+Morb0@users.noreply.github.com >
2024-10-15 18:41:27 +03:00
Pupchansky
947c2b84c6
Фикс parametrizedHandler-а
2024-10-09 21:12:59 +05:00
Pupchansky
f80b33a60a
Починил дискорд-чейнджлог
...
- wl-remove: Электродемон вырезан до лучших времён:pepe_life:
2024-09-28 15:53:48 +05:00
YesImMorty
94712aaf33
Update publish_multi_request.py
2024-09-25 00:31:03 +03:00
mosleyos
ffdb33d177
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstream
2024-09-24 23:58:13 +03:00
Morb
a494f336c7
Update publish_multi_request.py
2024-09-24 21:37:18 +03:00
Pupchansky
b6589ad668
еще
2024-09-22 15:53:51 +05:00
Pupchansky
403afd485a
Фикс паблишей
2024-09-22 15:29:30 +05:00
Pupchansky
12856b9330
Апстрим
2024-09-21 22:08:48 +05:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
Pieter-Jan Briers
b55366cf9b
chmod +x publish_multi_request.py ( #32274 )
...
Fuck.
2024-09-18 16:09:25 +02:00
Pieter-Jan Briers
8322b1c2d1
New publish workflow for Robust.Cdn ( #32222 )
...
This uses multiple API requests to directly send the publish to the CDN server, no more GitHub artifacts.
Faster, less moving parts.
Needs Robust.Cdn 2.2.0
2024-09-18 15:28:09 +02:00
Ed
675a9197f2
Easy IconSmooth spriting ( #32210 )
...
* фыр
* Update IconSmoothingTemplate README.txt
2024-09-18 11:41:24 +10:00
Pupchansky
b510440025
Фикс чейнджлог оповещения
2024-09-14 00:06:49 +05:00
Pupchansky
0b90e7b21e
Вероятно последний тест
...
- wl-add: тесттттттттттттттт
2024-09-13 13:44:26 +05:00
Pupchansky
ce19cc1f54
Еще тест
...
- wl-add: тест
2024-09-13 13:35:53 +05:00
Morb0
f2299c6f0f
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
2024-09-12 11:31:00 +03:00
Myra
0df531970b
Make the pr link more visible in the changelog bot ( #32047 )
2024-09-12 00:15:06 +02:00
Morb0
d9bfc5cdcb
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
Kara
7a6efeaba4
Properly credit contributors who were truncated by GitHub API ( #31739 )
...
* Properly credit contributors who were truncated by GitHub's 500 email limit
* update list oops forgot my origin was so out of date
* another
2024-09-09 13:31:27 -06:00
Pupchansky
eeac48430f
ups
2024-09-06 11:35:40 +05:00
Pupchansky
578a39d1b1
Апстрим
2024-08-25 18:54:10 +05:00
Pupchansky
e3b50162cf
После-апстримские фиксы
2024-08-21 13:33:59 +05:00
Pupchansky
8335bce65d
другая дебаг фигня
2024-08-18 18:38:56 +05:00
Pupchansky
81f5e29270
debug строки
2024-08-18 18:21:30 +05:00
Pupchansky
2213a7c169
эх, фикс
2024-08-18 17:19:07 +05:00
Pupchansky
30d084bcaf
Фикс
2024-08-18 17:07:09 +05:00
Pupchansky
5f22325ca7
ФИКСЫ
2024-08-18 16:46:14 +05:00
Pupchansky
42456d0b95
Еще фиксы...
2024-08-18 16:34:09 +05:00
Pupchansky
1efa5164f0
Фиксы
2024-08-18 15:58:52 +05:00
Pupchansky
99d97aff01
Почти итоговые тесты
2024-08-18 15:28:11 +05:00
Pupchansky
c5236f3e48
another тест
2024-08-18 13:30:42 +05:00
Pupchansky
d01849b391
Тестовые заготовки
2024-08-17 16:20:35 +05:00
Pupchansky
fa6ccd33e3
Небольшие фиксы
2024-08-13 21:28:05 +05:00
Pupchansky
85a2a7c595
Фиксы.. снова
...
- add: тест
2024-08-13 15:43:10 +05:00
Pupchansky
77e78e9910
Ааа, убейте меня, кто придумал этот питон
2024-08-13 15:07:41 +05:00
Pupchansky
505ab477a4
фиксы...
2024-08-13 15:04:27 +05:00
Pupchansky
df22f6cc3e
ненужный get-запрос, вех
2024-08-13 14:59:27 +05:00
