Morb0 636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Entry/EntryPoint.cs # Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs # Content.Server/Zombies/ZombifyOnDeathSystem.cs # Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Datasets/Names/cargo_shuttle.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.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/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-06-19 21:06:28 +03:00
..
corvax	Just copy secret folders	2023-04-16 11:07:28 +03:00
markings	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
ss14_ru	Terms support for locale scripts (#1146)	2023-06-18 19:54:34 +03:00
actions_changelogs_since_last_run.py	Add support multi changelogs file for github action	2023-03-30 11:14:52 +03:00
contribs_shared.ps1	Adds yet another dweeb to the name replacements (#10562)	2022-08-13 21:32:42 +02:00
dump_commits_since.ps1	Makes dump_commits_since.ps1 work on PowerShell 5.1 (#7680)	2022-04-21 09:39:02 +02:00
dump_contributors_since.ps1	Unify ignore/replacement lists for the two contrib ps1 scripts.	2022-05-16 22:27:29 +02:00
dump_github_contributors.ps1	Unify ignore/replacement lists for the two contrib ps1 scripts.	2022-05-16 22:27:29 +02:00
dump_patrons.ps1	Update patrons and credits (#13554)	2023-01-17 13:42:03 -08:00
dump_user_data.py	GDPR helper scripts stuff (#15077)	2023-04-03 10:27:45 +10:00
erase_user_data.py	GDPR helper scripts stuff (#15077)	2023-04-03 10:27:45 +10:00
gen_build_info.py	Update CDN url in build script	2023-02-11 20:21:54 +03:00
generate_hashes.ps1	Good job me.	2020-02-07 20:47:23 +01:00
iconsmooth.py	Add shuttle walls to icon smoothing (#10573)	2022-08-13 22:00:40 -07:00
iconsmooth_inv.py	Iconsmoothing: Subtile metrics (🦆 Edition) (#8307)	2022-06-05 16:35:04 +10:00
iconsmooth_lib.py	Add shuttle walls to icon smoothing (#10573)	2022-08-13 22:00:40 -07:00
mapping-merge-driver.sh	Mapping merge driver: continued (#2803)	2021-02-06 23:56:40 +01:00
package_client_build.py	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-06-19 21:06:28 +03:00
package_server_build.py	Add evil twin + Secrets (#823)	2023-02-18 23:49:55 -08:00
patrons_pr.ps1	Tiny PR script I need	2021-11-24 08:37:18 +01:00
singulo.m	Makes the singularity engine actually work stably. (#4068)	2021-05-28 11:44:13 +02:00
singulo_emitter.m	Makes the singularity engine actually work stably. (#4068)	2021-05-28 11:44:13 +02:00
update_changelog.py	Don't make empty changelog entries.	2021-11-18 00:48:08 +01:00