diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 9d7909f987..01a3ad1d49 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2772,3 +2772,40 @@ id: 216 time: '2024-03-24T08:59:57.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/227 +- author: ThereDrD + changes: + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u044D\u043A\u0441\u043F\ + \u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u043E\u0439\ + \ \u0434\u0443\u0431\u0438\u043D\u043A\u0438" + type: Add + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u043A\u043E\u0440\u0438\ + \u0447\u043D\u0435\u0432\u043E\u0433\u043E \u0434\u0438\u0432\u0430\u043D\u0430" + type: Add + - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u0433\u0430\u043B\u043E\ + \u0448" + type: Add + - message: "\u0421\u043F\u0440\u0430\u0439\u0442 \u0432\u043D\u0435\u0448\u043D\u0435\ + \u0433\u043E \u0443\u0433\u043B\u0430 \u0441\u0435\u0440\u043E\u0433\u043E \u0434\ + \u0438\u0432\u0430\u043D\u0430" + type: Fix + id: 217 + time: '2024-03-24T09:04:31.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/235 +- author: Armenian + changes: + - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0437\ + \u0430\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0440\u0435\u0441\u0443\ + \u0440\u0441\u044B \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0421\u0411\ + \ \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u043D\u0435\u043B\u0435\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\ + \u0430\u0442\u0440\u043E\u043D \u043F\u043E \u043F\u0440\u0438\u0435\u043C\u043B\ + \u0435\u043C\u044B\u043C \u0446\u0435\u043D\u0430\u043C." + type: Add + id: 218 + time: '2024-03-24T09:31:43.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/238 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index e23a756ca0..7cde7fbccd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -97,3 +97,51 @@ cost: 1000 category: Materials group: market + +- type: cargoProduct + name: Ящик с ураном + description: Ящик с 30 листами урана. + id: MaterialUranium + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: uranium + product: CrateMaterialUranium + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с золотом + description: Ящик с 30 слитками золота. + id: MaterialGold + icon: + sprite: Objects/Materials/ingots.rsi + state: gold + product: CrateMaterialGold + cost: 4000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с серебром + description: Ящик с 30 слитками серебра. + id: MaterialSilver + icon: + sprite: Objects/Materials/ingots.rsi + state: silver + product: CrateMaterialSilver + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с бананиумом + description: Ящик с 30 кусочками бананиума. + id: MaterialBananium + icon: + sprite: Objects/Materials/ore.rsi + state: bananium + product: CrateMaterialBananium + cost: 3000 + category: Materials + group: market diff --git a/Resources/Prototypes/White/Catalog/cargo.yml b/Resources/Prototypes/White/Catalog/cargo.yml deleted file mode 100644 index 34ea2aeba9..0000000000 --- a/Resources/Prototypes/White/Catalog/cargo.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CratePaper - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: paper - product: CratePaper - cost: 1000 - category: Materials - group: market \ No newline at end of file diff --git a/Resources/Prototypes/White/Actions/catears.yml b/Resources/Prototypes/_White/Actions/catears.yml similarity index 100% rename from Resources/Prototypes/White/Actions/catears.yml rename to Resources/Prototypes/_White/Actions/catears.yml diff --git a/Resources/Prototypes/White/Actions/emotes.yml b/Resources/Prototypes/_White/Actions/emotes.yml similarity index 100% rename from Resources/Prototypes/White/Actions/emotes.yml rename to Resources/Prototypes/_White/Actions/emotes.yml diff --git a/Resources/Prototypes/White/Actions/petsummon.yml b/Resources/Prototypes/_White/Actions/petsummon.yml similarity index 100% rename from Resources/Prototypes/White/Actions/petsummon.yml rename to Resources/Prototypes/_White/Actions/petsummon.yml diff --git a/Resources/Prototypes/White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml similarity index 100% rename from Resources/Prototypes/White/Actions/types.yml rename to Resources/Prototypes/_White/Actions/types.yml diff --git a/Resources/Prototypes/White/Alerts/alerts.yml b/Resources/Prototypes/_White/Alerts/alerts.yml similarity index 100% rename from Resources/Prototypes/White/Alerts/alerts.yml rename to Resources/Prototypes/_White/Alerts/alerts.yml diff --git a/Resources/Prototypes/White/Aspects/Aspects.yml b/Resources/Prototypes/_White/Aspects/Aspects.yml similarity index 100% rename from Resources/Prototypes/White/Aspects/Aspects.yml rename to Resources/Prototypes/_White/Aspects/Aspects.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/felinid.yml b/Resources/Prototypes/_White/Body/Prototypes/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/felinid.yml rename to Resources/Prototypes/_White/Body/Prototypes/felinid.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/harpy.yml b/Resources/Prototypes/_White/Body/Prototypes/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/harpy.yml rename to Resources/Prototypes/_White/Body/Prototypes/harpy.yml diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml similarity index 62% rename from Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml rename to Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 4457d0be07..20014d0bda 100644 --- a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -1,3 +1,13 @@ +- type: cargoProduct + id: CratePaper + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper + product: CratePaper + cost: 1000 + category: Materials + group: market + - type: cargoProduct name: ящик магазинов для ПП description: ящик с магазинами для пистолетов-пулеметов, заполненными патронами. @@ -10,16 +20,6 @@ category: Security group: market -- type: entity - id: CrateSubMachineGunCrateAmmo - parent: CrateWeaponSecure - name: ящик с магазинами для ПП - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGun - amount: 2 - - type: cargoProduct name: ящик магазинов для WT-550 description: ящик с магазинами для пистолетов-пулеметов WT-550, заполненными патронами. @@ -32,16 +32,6 @@ category: Security group: market -- type: entity - id: CrateWT550Magazines - parent: CrateWeaponSecure - name: ящик с магазинами для WT-550 - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunTopMounted - amount: 2 - - type: cargoProduct name: ящик магазинов для Лектера description: ящик с магазинами для Лектора, заполненными патронами. @@ -54,16 +44,6 @@ category: Security group: market -- type: entity - id: CrateLecterMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для Лектера - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - type: cargoProduct name: ящик магазинов для пистолетов description: ящик с магазинами для пистолетов, заполненными патронами. @@ -76,16 +56,6 @@ category: Security group: market -- type: entity - id: CratePistolMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: MagazinePistol - amount: 3 - - type: cargoProduct name: ящик магазинов для CV-47 description: ящик с магазинами для CV-47, заполненными патронами. @@ -98,16 +68,6 @@ category: Security group: market -- type: entity - id: CrateAKmagazines - parent: CrateWeaponSecure - name: ящик с магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - type: cargoProduct name: ящик патронов .35 авто description: ящик с упаковками патронов .35 авто @@ -120,16 +80,6 @@ category: Security group: market -- type: entity - id: Crate35auto - parent: CrateWeaponSecure - name: ящик патронов .35 авто - components: - - type: StorageFill - contents: - - id: MagazineBoxPistol - amount: 2 - - type: cargoProduct name: ящик патронов .30 description: ящик с упаковками патронов калибра .30 @@ -142,16 +92,6 @@ category: Security group: market -- type: entity - id: Crate30normal - parent: CrateWeaponSecure - name: ящик патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifle - amount: 2 - - type: cargoProduct name: ящик с большой коробкой патронов .30 description: ящик с патронами калибра .30 в большой коробке @@ -164,15 +104,6 @@ category: Security group: market -- type: entity - id: crate30big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifleBig - amount: 1 - type: cargoProduct name: пачки патронов .20 @@ -186,16 +117,6 @@ category: Security group: market -- type: entity - id: Crate20normal - parent: CrateWeaponSecure - name: ящик с пачками патронов калибра .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifle - amount: 2 - - type: cargoProduct name: ящик с большой коробкой патронов .20 description: ящик с патронами калибра .20 в большой коробке @@ -208,15 +129,6 @@ category: Security group: market -- type: entity - id: Crate20big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifleBig - amount: 1 - type: cargoProduct name: ящик патронов .40 магнум @@ -230,15 +142,6 @@ category: Security group: market -- type: entity - id: Crate40magnum - parent: CrateWeaponSecure - name: ящик патронов .40 магнум - components: - - type: StorageFill - contents: - - id: MagazineBoxMagnum - amount: 1 - type: cargoProduct name: коробки с дробью для дробовика @@ -252,16 +155,6 @@ category: Security group: market -- type: entity - id: CrateShotgunShell - parent: CrateWeaponSecure - name: ящик с дробью для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgun - amount: 3 - - type: cargoProduct name: коробки с травматическими патронами для дробовика description: ящик с магазинами травматических патронов для дробовика @@ -274,16 +167,6 @@ category: Security group: market -- type: entity - id: CrateShotgunShellTrauma - parent: CrateWeaponSecure - name: ящик с травматическими патронами для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgunBeanbag - amount: 4 - - type: cargoProduct name: ящик с дробовиками Каммерер description: набор стандартных дробовиков, поставляемых на станции НаноТрейзен. @@ -296,16 +179,6 @@ category: Security group: market -- type: entity - id: CrateKammerer - parent: CrateWeaponSecure - name: ящик с дробовиками Каммерер - components: - - type: StorageFill - contents: - - id: WeaponShotgunKammerer - amount: 2 - - type: cargoProduct name: ящик с CV-47 description: проверенная временем автоматическая винтовка. @@ -318,17 +191,6 @@ category: Security group: market -- type: entity - id: CrateCV47 - parent: CrateWeaponSecure - name: ящик с CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - id: WeaponRifleAk - amount: 1 - type: cargoProduct name: ящик с Лектером @@ -342,17 +204,6 @@ category: Security group: market -- type: entity - id: CrateLecter - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - id: WeaponRifleLecter - amount: 1 - type: cargoProduct name: ящик с винтовками Мосина @@ -366,12 +217,62 @@ category: Security group: market -- type: entity - id: CrateMosin - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: WeaponSniperMosin - amount: 2 +- type: cargoProduct + name: ящик нелетальных магазинов для пистолетов + description: ящик с с тремя нелетальными магазинами для пистолетов. + id: cargoPistolRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + state: rubber + product: CratePistolRubberMagazines + cost: 300 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для лектора + description: Ящик с тремя обоймами нелетальных магазинов для лектора. + id: CargoLecterRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateLecterRubberMagazines + cost: 500 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для ПП + description: Ящик с с тремя нелетальными магазинами для ПП. + id: cargoSubMachineGunRubberAmmo + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + state: rubber + product: CrateSubMachineGunRubberMagazines + cost: 400 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для CV-47 + description: Ящик с с тремя нелетальными магазинами для CV-47. + id: cargoRifleRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateRifleRubberMagazines + cost: 600 + category: Security + group: market + +- type: cargoProduct + name: Ящик скафандров СБ. + description: Ящик с двумя скафандрами СБ. Отлично подходит для прогулки в вакууме. + id: cargoSecurityVoidsuit + icon: + sprite: Clothing/Head/Hardsuits/security.rsi + state: icon-flash + product: CrateSecurityVoidsuit + cost: 4000 + category: Security + group: market diff --git a/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml rename to Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Prototypes/White/Catalog/Fills/misc.yml b/Resources/Prototypes/_White/Catalog/Fills/misc.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/misc.yml rename to Resources/Prototypes/_White/Catalog/Fills/misc.yml diff --git a/Resources/Prototypes/White/Catalog/seniors_fills.yml b/Resources/Prototypes/_White/Catalog/seniors_fills.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/seniors_fills.yml rename to Resources/Prototypes/_White/Catalog/seniors_fills.yml diff --git a/Resources/Prototypes/White/Catalog/uplink.yml b/Resources/Prototypes/_White/Catalog/uplink.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/uplink.yml rename to Resources/Prototypes/_White/Catalog/uplink.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/graphs.yml b/Resources/Prototypes/_White/Construction/Paperworks/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/graphs.yml rename to Resources/Prototypes/_White/Construction/Paperworks/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/structures.yml b/Resources/Prototypes/_White/Construction/Paperworks/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/structures.yml rename to Resources/Prototypes/_White/Construction/Paperworks/structures.yml diff --git a/Resources/Prototypes/White/Construction/Surgery/body_surgery.yml b/Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Surgery/body_surgery.yml rename to Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/graphs.yml b/Resources/Prototypes/_White/Construction/Wallmount/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/graphs.yml rename to Resources/Prototypes/_White/Construction/Wallmount/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/structures.yml b/Resources/Prototypes/_White/Construction/Wallmount/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/structures.yml rename to Resources/Prototypes/_White/Construction/Wallmount/structures.yml diff --git a/Resources/Prototypes/White/Damage/modifier_sets.yml b/Resources/Prototypes/_White/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/White/Damage/modifier_sets.yml rename to Resources/Prototypes/_White/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/White/Decals/drydock.yml b/Resources/Prototypes/_White/Decals/drydock.yml similarity index 100% rename from Resources/Prototypes/White/Decals/drydock.yml rename to Resources/Prototypes/_White/Decals/drydock.yml diff --git a/Resources/Prototypes/White/Economy/card.yml b/Resources/Prototypes/_White/Economy/card.yml similarity index 100% rename from Resources/Prototypes/White/Economy/card.yml rename to Resources/Prototypes/_White/Economy/card.yml diff --git a/Resources/Prototypes/White/Economy/eftpos.yml b/Resources/Prototypes/_White/Economy/eftpos.yml similarity index 100% rename from Resources/Prototypes/White/Economy/eftpos.yml rename to Resources/Prototypes/_White/Economy/eftpos.yml diff --git a/Resources/Prototypes/White/Economy/salary.yml b/Resources/Prototypes/_White/Economy/salary.yml similarity index 100% rename from Resources/Prototypes/White/Economy/salary.yml rename to Resources/Prototypes/_White/Economy/salary.yml diff --git a/Resources/Prototypes/White/Emotes/felinid_emotes.yml b/Resources/Prototypes/_White/Emotes/felinid_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/felinid_emotes.yml rename to Resources/Prototypes/_White/Emotes/felinid_emotes.yml diff --git a/Resources/Prototypes/White/Emotes/harpy_emotes.yml b/Resources/Prototypes/_White/Emotes/harpy_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/harpy_emotes.yml rename to Resources/Prototypes/_White/Emotes/harpy_emotes.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml rename to Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml b/Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml rename to Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/nigger.yml b/Resources/Prototypes/_White/Entities/Clothing/nigger.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/nigger.yml rename to Resources/Prototypes/_White/Entities/Clothing/nigger.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml b/Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/seniors_other.yml rename to Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/barmen.yml b/Resources/Prototypes/_White/Entities/Hampter/barmen.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/barmen.yml rename to Resources/Prototypes/_White/Entities/Hampter/barmen.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/centcom.yml b/Resources/Prototypes/_White/Entities/Hampter/centcom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/centcom.yml rename to Resources/Prototypes/_White/Entities/Hampter/centcom.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml b/Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml rename to Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/comisar.yml b/Resources/Prototypes/_White/Entities/Hampter/comisar.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/comisar.yml rename to Resources/Prototypes/_White/Entities/Hampter/comisar.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/deadth.yml b/Resources/Prototypes/_White/Entities/Hampter/deadth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/deadth.yml rename to Resources/Prototypes/_White/Entities/Hampter/deadth.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/emergency.yml b/Resources/Prototypes/_White/Entities/Hampter/emergency.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/emergency.yml rename to Resources/Prototypes/_White/Entities/Hampter/emergency.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/grey.yml b/Resources/Prototypes/_White/Entities/Hampter/grey.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/grey.yml rename to Resources/Prototypes/_White/Entities/Hampter/grey.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/greywave.yml b/Resources/Prototypes/_White/Entities/Hampter/greywave.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/greywave.yml rename to Resources/Prototypes/_White/Entities/Hampter/greywave.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/hamhell.yml b/Resources/Prototypes/_White/Entities/Hampter/hamhell.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/hamhell.yml rename to Resources/Prototypes/_White/Entities/Hampter/hamhell.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/krah.yml b/Resources/Prototypes/_White/Entities/Hampter/krah.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/krah.yml rename to Resources/Prototypes/_White/Entities/Hampter/krah.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml b/Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/med_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/med_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/shrek.yml b/Resources/Prototypes/_White/Entities/Hampter/shrek.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/shrek.yml rename to Resources/Prototypes/_White/Entities/Hampter/shrek.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/virusolog.yml b/Resources/Prototypes/_White/Entities/Hampter/virusolog.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/virusolog.yml rename to Resources/Prototypes/_White/Entities/Hampter/virusolog.yml diff --git a/Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml b/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml rename to Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml new file mode 100644 index 0000000000..2095696cd8 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml @@ -0,0 +1,39 @@ +- type: entity + id: CrateMaterialBananium + parent: CrateGenericSteel + name: ящик с бананиумом + components: + - type: StorageFill + contents: + - id: MaterialBananium + amount: 3 + +- type: entity + id: CrateMaterialSilver + parent: CrateGenericSteel + name: ящик с серебром + components: + - type: StorageFill + contents: + - id: IngotSilver + amount: 1 + +- type: entity + id: CrateMaterialGold + parent: CrateGenericSteel + name: ящик с золотом + components: + - type: StorageFill + contents: + - id: IngotGold + amount: 1 + +- type: entity + id: CrateMaterialUranium + parent: CrateGenericSteel + name: ящик урана + components: + - type: StorageFill + contents: + - id: SheetUranium + amount: 1 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml new file mode 100644 index 0000000000..b39dca5408 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -0,0 +1,223 @@ +- type: entity + id: CrateSubMachineGunCrateAmmo + parent: CrateWeaponSecure + name: ящик с магазинами для ПП + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGun + amount: 2 + +- type: entity + id: CrateWT550Magazines + parent: CrateWeaponSecure + name: ящик с магазинами для WT-550 + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunTopMounted + amount: 2 + +- type: entity + id: CrateLecterMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для Лектера + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + +- type: entity + id: CratePistolMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 3 + +- type: entity + id: CrateAKmagazines + parent: CrateWeaponSecure + name: ящик с магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + +- type: entity + id: Crate35auto + parent: CrateWeaponSecure + name: ящик патронов .35 авто + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 2 + +- type: entity + id: Crate30normal + parent: CrateWeaponSecure + name: ящик патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 2 + +- type: entity + id: crate30big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 1 + +- type: entity + id: Crate20normal + parent: CrateWeaponSecure + name: ящик с пачками патронов калибра .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 2 + +- type: entity + id: Crate20big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 1 + +- type: entity + id: Crate40magnum + parent: CrateWeaponSecure + name: ящик патронов .40 магнум + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 1 + +- type: entity + id: CrateShotgunShell + parent: CrateWeaponSecure + name: ящик с дробью для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 3 + +- type: entity + id: CrateShotgunShellTrauma + parent: CrateWeaponSecure + name: ящик с травматическими патронами для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 4 + +- type: entity + id: CrateKammerer + parent: CrateWeaponSecure + name: ящик с дробовиками Каммерер + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + +- type: entity + id: CrateCV47 + parent: CrateWeaponSecure + name: ящик с CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - id: WeaponRifleAk + amount: 1 + +- type: entity + id: CrateLecter + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - id: WeaponRifleLecter + amount: 1 + +- type: entity + id: CrateMosin + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + amount: 2 + +- type: entity + id: CratePistolRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolRubber + amount: 1 + +- type: entity + id: CrateLecterRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для лектора + components: + - type: StorageFill + contents: + - id: BoxMagazineRifleRubber + amount: 1 + +- type: entity + id: CrateSubMachineGunRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для ПП + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolSubMachineGunRubber + amount: 1 + +- type: entity + id: CrateRifleRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: BoxMagazineLightRifleRubber + amount: 1 + +- type: entity + id: CrateSecurityVoidsuit + parent: CrateWeaponSecure + name: ящик с скафандрами СБ + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSecurity + amount: 2 diff --git a/Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml b/Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml rename to Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/books.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/books.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/books.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/paper.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml rename to Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml diff --git a/Resources/Prototypes/White/Fluff/centurion.yml b/Resources/Prototypes/_White/Fluff/centurion.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/centurion.yml rename to Resources/Prototypes/_White/Fluff/centurion.yml diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff.yml rename to Resources/Prototypes/_White/Fluff/fluff.yml diff --git a/Resources/Prototypes/White/Fluff/fluff1.yml b/Resources/Prototypes/_White/Fluff/fluff1.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff1.yml rename to Resources/Prototypes/_White/Fluff/fluff1.yml diff --git a/Resources/Prototypes/White/Fluff/serbwo.yml b/Resources/Prototypes/_White/Fluff/serbwo.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/serbwo.yml rename to Resources/Prototypes/_White/Fluff/serbwo.yml diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/sponsor.yml rename to Resources/Prototypes/_White/Fluff/sponsor.yml diff --git a/Resources/Prototypes/White/Fluff/waggier.yml b/Resources/Prototypes/_White/Fluff/waggier.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/waggier.yml rename to Resources/Prototypes/_White/Fluff/waggier.yml diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml similarity index 100% rename from Resources/Prototypes/White/Ghosts/custom_ghosts.yml rename to Resources/Prototypes/_White/Ghosts/custom_ghosts.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml b/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/tapes.yml b/Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/tapes.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Pets/pets.yml b/Resources/Prototypes/_White/Mobs/Pets/pets.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Pets/pets.yml rename to Resources/Prototypes/_White/Mobs/Pets/pets.yml diff --git a/Resources/Prototypes/White/Mobs/Player/felinid.yml b/Resources/Prototypes/_White/Mobs/Player/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/felinid.yml rename to Resources/Prototypes/_White/Mobs/Player/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Player/harpy.yml b/Resources/Prototypes/_White/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/harpy.yml rename to Resources/Prototypes/_White/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/White/Mobs/Player/human.yml b/Resources/Prototypes/_White/Mobs/Player/human.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/human.yml rename to Resources/Prototypes/_White/Mobs/Player/human.yml diff --git a/Resources/Prototypes/White/Mobs/Species/felinid.yml b/Resources/Prototypes/_White/Mobs/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/felinid.yml rename to Resources/Prototypes/_White/Mobs/Species/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Species/harpy.yml b/Resources/Prototypes/_White/Mobs/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/harpy.yml rename to Resources/Prototypes/_White/Mobs/Species/harpy.yml diff --git a/Resources/Prototypes/White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_negativeEffects.yml rename to Resources/Prototypes/_White/Mood/generic_negativeEffects.yml diff --git a/Resources/Prototypes/White/Mood/generic_positveEffects.yml b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_positveEffects.yml rename to Resources/Prototypes/_White/Mood/generic_positveEffects.yml diff --git a/Resources/Prototypes/White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml similarity index 100% rename from Resources/Prototypes/White/Mood/moodEffects_needs.yml rename to Resources/Prototypes/_White/Mood/moodEffects_needs.yml diff --git a/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml b/Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml similarity index 100% rename from Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml rename to Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/magic.yml b/Resources/Prototypes/_White/Objects/Scrolls/magic.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/magic.yml rename to Resources/Prototypes/_White/Objects/Scrolls/magic.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml b/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/scrolls.yml rename to Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml diff --git a/Resources/Prototypes/White/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Specific/Species/felinid.yml rename to Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml diff --git a/Resources/Prototypes/White/Objects/Tools/crafts.yml b/Resources/Prototypes/_White/Objects/Tools/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/crafts.yml rename to Resources/Prototypes/_White/Objects/Tools/crafts.yml diff --git a/Resources/Prototypes/White/Objects/Tools/form.yml b/Resources/Prototypes/_White/Objects/Tools/form.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/form.yml rename to Resources/Prototypes/_White/Objects/Tools/form.yml diff --git a/Resources/Prototypes/White/Objects/Tools/key.yml b/Resources/Prototypes/_White/Objects/Tools/key.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/key.yml rename to Resources/Prototypes/_White/Objects/Tools/key.yml diff --git a/Resources/Prototypes/White/Recipes/crafts.yml b/Resources/Prototypes/_White/Recipes/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/crafts.yml rename to Resources/Prototypes/_White/Recipes/crafts.yml diff --git a/Resources/Prototypes/White/Recipes/hidden_crafts.yml b/Resources/Prototypes/_White/Recipes/hidden_crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/hidden_crafts.yml rename to Resources/Prototypes/_White/Recipes/hidden_crafts.yml diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/lathe_recipes.yml rename to Resources/Prototypes/_White/Recipes/lathe_recipes.yml diff --git a/Resources/Prototypes/White/Research/arsenal.yml b/Resources/Prototypes/_White/Research/arsenal.yml similarity index 100% rename from Resources/Prototypes/White/Research/arsenal.yml rename to Resources/Prototypes/_White/Research/arsenal.yml diff --git a/Resources/Prototypes/White/Research/experimental.yml b/Resources/Prototypes/_White/Research/experimental.yml similarity index 100% rename from Resources/Prototypes/White/Research/experimental.yml rename to Resources/Prototypes/_White/Research/experimental.yml diff --git a/Resources/Prototypes/White/SoundCollections/coindrop.yml b/Resources/Prototypes/_White/SoundCollections/coindrop.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/coindrop.yml rename to Resources/Prototypes/_White/SoundCollections/coindrop.yml diff --git a/Resources/Prototypes/White/SoundCollections/felinid.yml b/Resources/Prototypes/_White/SoundCollections/felinid.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/felinid.yml rename to Resources/Prototypes/_White/SoundCollections/felinid.yml diff --git a/Resources/Prototypes/White/SoundCollections/harpy.yml b/Resources/Prototypes/_White/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/harpy.yml rename to Resources/Prototypes/_White/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/White/SoundCollections/web.yml b/Resources/Prototypes/_White/SoundCollections/web.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/web.yml rename to Resources/Prototypes/_White/SoundCollections/web.yml diff --git a/Resources/Prototypes/White/Species/actions.yml b/Resources/Prototypes/_White/Species/actions.yml similarity index 100% rename from Resources/Prototypes/White/Species/actions.yml rename to Resources/Prototypes/_White/Species/actions.yml diff --git a/Resources/Prototypes/White/Species/felinid.yml b/Resources/Prototypes/_White/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Species/felinid.yml rename to Resources/Prototypes/_White/Species/felinid.yml diff --git a/Resources/Prototypes/White/Species/harpy.yml b/Resources/Prototypes/_White/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Species/harpy.yml rename to Resources/Prototypes/_White/Species/harpy.yml diff --git a/Resources/Prototypes/White/StatusEffects/criminal_records.yml b/Resources/Prototypes/_White/StatusEffects/criminal_records.yml similarity index 100% rename from Resources/Prototypes/White/StatusEffects/criminal_records.yml rename to Resources/Prototypes/_White/StatusEffects/criminal_records.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml b/Resources/Prototypes/_White/Structures/Airlocks/qm.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml rename to Resources/Prototypes/_White/Structures/Airlocks/qm.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml b/Resources/Prototypes/_White/Structures/Furniture/benches.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml rename to Resources/Prototypes/_White/Structures/Furniture/benches.yml diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/_White/Structures/Machines/atm.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Machines/atm.yml rename to Resources/Prototypes/_White/Structures/Machines/atm.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml b/Resources/Prototypes/_White/Structures/Machines/doc_printer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml rename to Resources/Prototypes/_White/Structures/Machines/doc_printer.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml b/Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml rename to Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml b/Resources/Prototypes/_White/Structures/Wallmounts/auth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml rename to Resources/Prototypes/_White/Structures/Wallmounts/auth.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml rename to Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/_White/Structures/Windows/paper.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Windows/paper.yml rename to Resources/Prototypes/_White/Structures/Windows/paper.yml diff --git a/Resources/Prototypes/White/Tiles/floors.yml b/Resources/Prototypes/_White/Tiles/floors.yml similarity index 100% rename from Resources/Prototypes/White/Tiles/floors.yml rename to Resources/Prototypes/_White/Tiles/floors.yml diff --git a/Resources/Prototypes/White/event_prototypes.yml b/Resources/Prototypes/_White/event_prototypes.yml similarity index 100% rename from Resources/Prototypes/White/event_prototypes.yml rename to Resources/Prototypes/_White/event_prototypes.yml diff --git a/Resources/Prototypes/White/polymorphs.yml b/Resources/Prototypes/_White/polymorphs.yml similarity index 100% rename from Resources/Prototypes/White/polymorphs.yml rename to Resources/Prototypes/_White/polymorphs.yml diff --git a/Resources/Prototypes/White/store_categories.yml b/Resources/Prototypes/_White/store_categories.yml similarity index 100% rename from Resources/Prototypes/White/store_categories.yml rename to Resources/Prototypes/_White/store_categories.yml diff --git a/Resources/Prototypes/White/tags.yml b/Resources/Prototypes/_White/tags.yml similarity index 100% rename from Resources/Prototypes/White/tags.yml rename to Resources/Prototypes/_White/tags.yml diff --git a/Resources/Prototypes/White/tts-voices.yml b/Resources/Prototypes/_White/tts-voices.yml similarity index 100% rename from Resources/Prototypes/White/tts-voices.yml rename to Resources/Prototypes/_White/tts-voices.yml diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png index 26d62be00e..cab114ddf0 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-body-slim.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png index 96977070ed..0e57494719 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png index 213ea5ebe8..6580f1da7e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png index 1ff3a792af..12edf43a23 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png index 65a7aba6c3..d135a13acc 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/equipped-BELT.png index 44fdc4d1bc..b09d56bd95 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/equipped-BELT.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json index 718f27265e..fc15bfadef 100644 --- a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/meta.json @@ -1,103 +1,103 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation and repainted by Kotovskiy (Discord User ID: 462526160773840908)", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_off" }, - "states": [ - { - "name": "stunbaton_off" - }, - { - "name": "stunbaton_nocell" - }, - { - "name": "stunbaton_on", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "on-inhand-right", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png index 1bdbde7653..5745950b7d 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png index 78ededb1f0..f2588a2eb3 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png index 176639dc2e..493ec5508d 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png index ef7a8a9a0b..f2f97ebbd2 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png index cef544109d..591c1d2072 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_nocell.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png index 9c520eb1aa..8e1e88b790 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_off.png differ diff --git a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png index 6501b35023..fc9811667f 100644 Binary files a/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png and b/Resources/Textures/White/Objects/Weapons/experimental_stunbaton.rsi/stunbaton_on.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png index 0c5ea7ab8f..d403f66045 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_left.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png index 8989852c20..4b3c581085 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/arm_right.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png index d18237d23a..96e01ae8b2 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png index a6157a0729..21371102fe 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/corner_out.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png index dd4dd8e800..1c3205d3e8 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/left.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png index 589526aa75..e94561941d 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/middle.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/right.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/right.png index fd1d114270..4d4bd4def7 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/right.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa.rsi/right.png differ diff --git a/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png b/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png index 306d354e2c..c42b9c3a81 100644 Binary files a/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png and b/Resources/Textures/White/Structures/Furniture/Benches/sofa_corp.rsi/corner_out.png differ