Merge branch 'master-syndie' into augment-markings

# Conflicts: # Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/nanotrasen.rsi/r_arm.png # Resources/Textures/Corvax/Mobs/Customization/Cyberlimbs/nanotrasen.rsi/r_hand.png
space-syndicate · Oct 21, 2023 · 7dfe4a3 · 7dfe4a3
2 parents b5ece83 + 5539ef1
commit 7dfe4a3
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 266 deletions.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor.ftl
diff --git a/.../Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl b/.../Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
diff --git a/...es/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl b/...es/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
diff --git a/.../Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl b/.../Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
diff --git a/...ces/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl b/...ces/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
diff --git a/.../en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl b/.../en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
diff --git a/...s14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl b/...s14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor.ftl
diff --git a/.../Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl b/.../Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
diff --git a/...es/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl b/...es/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
diff --git a/.../Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl b/.../Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
diff --git a/.../ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl b/.../ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
diff --git a/...s14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl b/...s14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
diff --git a/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml