From cbb8cb5e3cca2ba417ca1ce4471ed9784a48689d Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 01:35:18 +0300 Subject: [PATCH 1/6] remove lgbt --- .../Corvax/Entities/Clothing/Neck/cloaks.yml | 81 +++++++ .../Corvax/Entities/Clothing/Neck/pins.yml | 131 ++++++++++++ .../Entities/Objects/Misc/handy_flags.yml | 11 + .../Structures/Wallmounts/Signs/flags.yml | 9 + .../Loadouts/Miscellaneous/trinkents.yml | 60 ++++++ .../Entities/Clothing/Neck/cloaks.yml | 147 ++++++------- .../Entities/Clothing/Neck/pins.yml | 202 +++++++++--------- .../Markers/Spawners/Random/maintenance.yml | 36 ++-- .../Entities/Objects/Decoration/present.yml | 6 +- .../Entities/Objects/Misc/handy_flags.yml | 24 ++- .../Entities/Structures/Furniture/dresser.yml | 11 +- .../Structures/Wallmounts/Signs/flags.yml | 20 +- .../Loadouts/Miscellaneous/trinkets.yml | 120 ++++++----- .../Prototypes/Loadouts/loadout_groups.yml | 36 ++-- .../Neck/Misc/pins.rsi/lgbt-equipped-NECK.png | Bin 152 -> 0 bytes .../Clothing/Neck/Misc/pins.rsi/lgbt.png | Bin 275 -> 0 bytes .../Clothing/Neck/Misc/pins.rsi/meta.json | 72 +------ .../Neck/Cloaks/chief.rsi}/equipped-NECK.png | Bin .../Clothing/Neck/Cloaks/chief.rsi}/icon.png | Bin .../Neck/Cloaks/chief.rsi}/inhand-left.png | Bin .../Neck/Cloaks/chief.rsi}/inhand-right.png | Bin .../Clothing/Neck/Cloaks/chief.rsi}/meta.json | 0 .../Cloaks/cyclope.rsi}/equipped-NECK.png | Bin .../Neck/Cloaks/cyclope.rsi}/icon.png | Bin .../Neck/Cloaks/cyclope.rsi}/inhand-left.png | Bin .../Neck/Cloaks/cyclope.rsi}/inhand-right.png | Bin .../Neck/Cloaks/cyclope.rsi}/meta.json | 0 .../Cloaks/marketing.rsi}/equipped-NECK.png | Bin .../Neck/Cloaks/marketing.rsi}/icon.png | Bin .../Cloaks/marketing.rsi}/inhand-left.png | Bin .../Cloaks/marketing.rsi}/inhand-right.png | Bin .../Neck/Cloaks/marketing.rsi}/meta.json | 0 .../Neck/Cloaks/pilot.rsi}/equipped-NECK.png | Bin .../Clothing/Neck/Cloaks/pilot.rsi}/icon.png | Bin .../Neck/Cloaks/pilot.rsi}/inhand-left.png | Bin .../Neck/Cloaks/pilot.rsi}/inhand-right.png | Bin .../Clothing/Neck/Cloaks/pilot.rsi}/meta.json | 0 .../Neck/Cloaks/poet.rsi}/equipped-NECK.png | Bin .../Clothing/Neck/Cloaks/poet.rsi}/icon.png | Bin .../Neck/Cloaks/poet.rsi}/inhand-left.png | Bin .../Neck/Cloaks/poet.rsi}/inhand-right.png | Bin .../Clothing/Neck/Cloaks/poet.rsi}/meta.json | 0 .../Neck/Cloaks/poison.rsi}/equipped-NECK.png | Bin .../Clothing/Neck/Cloaks/poison.rsi}/icon.png | Bin .../Neck/Cloaks/poison.rsi}/inhand-left.png | Bin .../Neck/Cloaks/poison.rsi}/inhand-right.png | Bin .../Neck/Cloaks/poison.rsi}/meta.json | 0 .../Cloaks/prospector.rsi}/equipped-NECK.png | Bin .../Neck/Cloaks/prospector.rsi}/icon.png | Bin .../Cloaks/prospector.rsi}/inhand-left.png | Bin .../Cloaks/prospector.rsi}/inhand-right.png | Bin .../Neck/Cloaks/prospector.rsi}/meta.json | 0 .../Cloaks/vampire.rsi}/equipped-NECK.png | Bin .../Neck/Cloaks/vampire.rsi}/icon.png | Bin .../Neck/Cloaks/vampire.rsi}/inhand-left.png | Bin .../Neck/Cloaks/vampire.rsi}/inhand-right.png | Bin .../Neck/Cloaks/vampire.rsi}/meta.json | 0 .../Cloaks/werewolf.rsi}/equipped-NECK.png | Bin .../Neck/Cloaks/werewolf.rsi}/icon.png | Bin .../Neck/Cloaks/werewolf.rsi}/inhand-left.png | Bin .../Cloaks/werewolf.rsi}/inhand-right.png | Bin .../Neck/Cloaks/werewolf.rsi}/meta.json | 0 .../Misc/pins.rsi/chief-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/chief.png} | Bin .../Misc/pins.rsi/cyclope-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/cyclope.png} | Bin .../pins.rsi/marketing-equipped-NECK.png} | Bin .../Neck/Misc/pins.rsi/marketing.png} | Bin .../Clothing/Neck/Misc/pins.rsi/meta.json | 88 +++++++- .../Misc/pins.rsi/pilot-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/pilot.png} | Bin .../Misc/pins.rsi/poet-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/poet.png} | Bin .../Misc/pins.rsi/poison-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/poison.png} | Bin .../pins.rsi/prospector-equipped-NECK.png} | Bin .../Neck/Misc/pins.rsi/prospector.png} | Bin .../Misc/pins.rsi/rainbow-equipped-NECK.png | Bin 0 -> 168 bytes .../Clothing/Neck/Misc/pins.rsi/rainbow.png | Bin 0 -> 310 bytes .../Misc/pins.rsi/vampire-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/vampire.png} | Bin .../Misc/pins.rsi/warewolf-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/warewolf.png} | Bin .../rainbow_handy_flag.rsi/icon.png | Bin 0 -> 502 bytes .../rainbow_handy_flag.rsi/inhand-left.png | Bin 0 -> 463 bytes .../rainbow_handy_flag.rsi/inhand-right.png | Bin 0 -> 524 bytes .../rainbow_handy_flag.rsi/meta.json | 22 ++ .../Structures/Wallmounts/flags.rsi/meta.json | 14 ++ .../Wallmounts/flags.rsi/rainbow_flag.png | Bin 0 -> 675 bytes .../Handy_Flags/lgbtq_handy_flag.rsi/icon.png | Bin 395 -> 502 bytes .../lgbtq_handy_flag.rsi/inhand-left.png | Bin 402 -> 463 bytes .../lgbtq_handy_flag.rsi/inhand-right.png | Bin 402 -> 524 bytes .../lgbtq_handy_flag.rsi/meta.json | 2 +- .../Wallmounts/flags.rsi/lgbtq_flag.png | Bin 443 -> 0 bytes .../Structures/Wallmounts/flags.rsi/meta.json | 3 - Resources/migration.yml | 23 ++ 96 files changed, 754 insertions(+), 364 deletions(-) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml delete mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png delete mode 100644 Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png rename Resources/Textures/{Clothing/Neck/Cloaks/pan.rsi => Corvax/Clothing/Neck/Cloaks/chief.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/pan.rsi => Corvax/Clothing/Neck/Cloaks/chief.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/pan.rsi => Corvax/Clothing/Neck/Cloaks/chief.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/pan.rsi => Corvax/Clothing/Neck/Cloaks/chief.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/ace.rsi => Corvax/Clothing/Neck/Cloaks/chief.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/intersex.rsi => Corvax/Clothing/Neck/Cloaks/cyclope.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/intersex.rsi => Corvax/Clothing/Neck/Cloaks/cyclope.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/intersex.rsi => Corvax/Clothing/Neck/Cloaks/cyclope.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/intersex.rsi => Corvax/Clothing/Neck/Cloaks/cyclope.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/aro.rsi => Corvax/Clothing/Neck/Cloaks/cyclope.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/gay.rsi => Corvax/Clothing/Neck/Cloaks/marketing.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/gay.rsi => Corvax/Clothing/Neck/Cloaks/marketing.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/gay.rsi => Corvax/Clothing/Neck/Cloaks/marketing.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/gay.rsi => Corvax/Clothing/Neck/Cloaks/marketing.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/bi.rsi => Corvax/Clothing/Neck/Cloaks/marketing.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/ace.rsi => Corvax/Clothing/Neck/Cloaks/pilot.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/ace.rsi => Corvax/Clothing/Neck/Cloaks/pilot.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/ace.rsi => Corvax/Clothing/Neck/Cloaks/pilot.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/ace.rsi => Corvax/Clothing/Neck/Cloaks/pilot.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/enby.rsi => Corvax/Clothing/Neck/Cloaks/pilot.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/les.rsi => Corvax/Clothing/Neck/Cloaks/poet.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/les.rsi => Corvax/Clothing/Neck/Cloaks/poet.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/les.rsi => Corvax/Clothing/Neck/Cloaks/poet.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/les.rsi => Corvax/Clothing/Neck/Cloaks/poet.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/gay.rsi => Corvax/Clothing/Neck/Cloaks/poet.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/bi.rsi => Corvax/Clothing/Neck/Cloaks/poison.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/bi.rsi => Corvax/Clothing/Neck/Cloaks/poison.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/bi.rsi => Corvax/Clothing/Neck/Cloaks/poison.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/bi.rsi => Corvax/Clothing/Neck/Cloaks/poison.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/intersex.rsi => Corvax/Clothing/Neck/Cloaks/poison.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/enby.rsi => Corvax/Clothing/Neck/Cloaks/prospector.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/enby.rsi => Corvax/Clothing/Neck/Cloaks/prospector.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/enby.rsi => Corvax/Clothing/Neck/Cloaks/prospector.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/enby.rsi => Corvax/Clothing/Neck/Cloaks/prospector.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/les.rsi => Corvax/Clothing/Neck/Cloaks/prospector.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/trans.rsi => Corvax/Clothing/Neck/Cloaks/vampire.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/trans.rsi => Corvax/Clothing/Neck/Cloaks/vampire.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/trans.rsi => Corvax/Clothing/Neck/Cloaks/vampire.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/trans.rsi => Corvax/Clothing/Neck/Cloaks/vampire.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/trans.rsi => Corvax/Clothing/Neck/Cloaks/vampire.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/aro.rsi => Corvax/Clothing/Neck/Cloaks/werewolf.rsi}/equipped-NECK.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/aro.rsi => Corvax/Clothing/Neck/Cloaks/werewolf.rsi}/icon.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/aro.rsi => Corvax/Clothing/Neck/Cloaks/werewolf.rsi}/inhand-left.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/aro.rsi => Corvax/Clothing/Neck/Cloaks/werewolf.rsi}/inhand-right.png (100%) rename Resources/Textures/{Clothing/Neck/Cloaks/pan.rsi => Corvax/Clothing/Neck/Cloaks/werewolf.rsi}/meta.json (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/chief-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/pan.png => Corvax/Clothing/Neck/Misc/pins.rsi/chief.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/cyclope-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/inter.png => Corvax/Clothing/Neck/Misc/pins.rsi/cyclope.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/marketing-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/gay.png => Corvax/Clothing/Neck/Misc/pins.rsi/marketing.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/pilot-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/asex.png => Corvax/Clothing/Neck/Misc/pins.rsi/pilot.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/poet-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/les.png => Corvax/Clothing/Neck/Misc/pins.rsi/poet.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/poison-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/bi.png => Corvax/Clothing/Neck/Misc/pins.rsi/poison.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/prospector-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/non.png => Corvax/Clothing/Neck/Misc/pins.rsi/prospector.png} (100%) create mode 100644 Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow-equipped-NECK.png create mode 100644 Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow.png rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/vampire-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/trans.png => Corvax/Clothing/Neck/Misc/pins.rsi/vampire.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png => Corvax/Clothing/Neck/Misc/pins.rsi/warewolf-equipped-NECK.png} (100%) rename Resources/Textures/{Clothing/Neck/Misc/pins.rsi/aro.png => Corvax/Clothing/Neck/Misc/pins.rsi/warewolf.png} (100%) create mode 100644 Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/icon.png create mode 100644 Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-left.png create mode 100644 Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-right.png create mode 100644 Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/rainbow_flag.png delete mode 100644 Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml index 38f96995359..5c883dd617d 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml @@ -15,3 +15,84 @@ components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/admiral.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPilot + name: плащ пилота + description: Плащ, вручаемый лучшим космическим асам Nanotrasen. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/pilot.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakWerewolf + name: плащ вервольфа + description: Этот плащ позволяет окружающим понять, что вы - одинокий волк. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/werewolf.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPoison + name: ядовитый плащ + description: Пурпурный цвет - явный признак того, что вы ядовиты. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/poison.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakCyclope + name: плащ циклопа + description: Круг на этом плаще представляет собой глаз циклопа. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/cyclope.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPoet + name: плащ поэта + description: Этот плащ принадлежал древнему поэту, вы забыли, какому именно. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/poet.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakMarketing + name: плащ сетевого маркетинга + description: Этот плащ пользуется большим спросом в маркетинговых офисах Nanotrasen. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/marketing.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakProspector + name: плащ кладоискателя + description: Этот плащ принадлежал жадному искателю сокровищ. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/prospector.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakChief + name: поварской плащ + description: Предназначен для ношения вместе со сковородой. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/chief.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakVampire + name: вампирский плащ + description: Его носят высокопоставленные вампиры из трансильванского общества вампиров. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Cloaks/vampire.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml index a708f38c6fb..1b577e1dd90 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -231,3 +231,134 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: wl + +### +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckRainbowPin + name: значок радуги + description: Дождик кончился. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: rainbow + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: rainbow + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckPilotPin + name: значок пилота + description: Значок, вручаемый лучшим космическим асам Nanotrasen. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: pilot + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: pilot + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckWerewolfPin + name: значок вервольфа + description: Этот значок позволяет окружающим понять, что вы - одинокий волк. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: warewolf + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: warewolf + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckPoisonPin + name: ядовитый значок + description: Пурпурный цвет - явный признак того, что вы ядовиты. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: poison + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: poison + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckCyclopePin + name: значок циклопа + description: Круг на этом плаще представляет собой глаз циклопа. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: cyclope + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: cyclope + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckPoetPin + name: значок поэта + description: Этот значок принадлежал древнему поэту, вы забыли, какому именно. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: poet + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: poet + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckMarketingPin + name: значок сетевого маркетинга + description: Этот значок пользуется большим спросом в маркетинговых офисах Nanotrasen. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: marketing + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: marketing + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckProspectorPin + name: значок кладоискателя + description: Этот значок принадлежал жадному искателю сокровищ. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: prospector + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: prospector + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckChiefPin + name: поварской значок + description: Предназначен для ношения вместе со сковородой. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: chief + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: chief + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckVampirePin + name: вампирский плащ + description: Его носят высокопоставленные вампиры из трансильванского общества вампиров. + components: + - type: Sprite + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + state: vampire + - type: Clothing + sprite: Corvax/Clothing/Neck/Misc/pins.rsi + equippedPrefix: vampire diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml new file mode 100644 index 00000000000..1c0cece235f --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BaseItem + id: RainbowHandyFlag + name: флажок радуги + description: "Дождик кончился." + components: + - type: Sprite + sprite: Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi + state: icon + - type: Item + sprite: Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml new file mode 100644 index 00000000000..f86c0ddfb44 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseFlag + id: RainbowFlag + name: флаг радуги + description: "Дождик кончился." + components: + - type: Sprite + sprite: Corvax/Structures/Wallmounts/flags.rsi + state: rainbow_flag diff --git a/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/trinkents.yml b/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/trinkents.yml index 5613ad390a5..316219a311b 100644 --- a/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/trinkents.yml +++ b/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/trinkents.yml @@ -52,3 +52,63 @@ storage: back: - ClothingNeckWhiteListPin + +- type: loadout + id: ClothingNeckRainbowPin + storage: + back: + - ClothingNeckRainbowPin + +- type: loadout + id: ClothingNeckWerewolfPin + storage: + back: + - ClothingNeckWerewolfPin + +- type: loadout + id: ClothingNeckPilotPin + storage: + back: + - ClothingNeckPilotPin + +- type: loadout + id: ClothingNeckPoisonPin + storage: + back: + - ClothingNeckPoisonPin + +- type: loadout + id: ClothingNeckMarketingPin + storage: + back: + - ClothingNeckMarketingPin + +- type: loadout + id: ClothingNeckCyclopePin + storage: + back: + - ClothingNeckCyclopePin + +- type: loadout + id: ClothingNeckPoetPin + storage: + back: + - ClothingNeckPoetPin + +- type: loadout + id: ClothingNeckProspectorPin + storage: + back: + - ClothingNeckProspectorPin + +- type: loadout + id: ClothingNeckChiefPin + storage: + back: + - ClothingNeckChiefPin + +- type: loadout + id: ClothingNeckVampirePin + storage: + back: + - ClothingNeckVampirePin diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 02a8ec62b13..d68955fec7e 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -135,15 +135,6 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/miner.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakTrans - name: vampire cloak - description: Worn by high ranking vampires of the transylvanian society of vampires. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/trans.rsi - - type: entity parent: ClothingNeckBase id: ClothingNeckCloakGoliathCloak @@ -208,75 +199,85 @@ - type: TypingIndicatorClothing proto: alien -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakAce - name: pilot's cloak - description: Cloak awarded to Nanotrasen's finest space aces. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/ace.rsi +# Corvax-start +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakAce +# name: pilot's cloak +# description: Cloak awarded to Nanotrasen's finest space aces. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/ace.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakAro - name: werewolf cloak - description: This cloak lets others know you're a lone wolf. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/aro.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakAro +# name: werewolf cloak +# description: This cloak lets others know you're a lone wolf. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/aro.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakBi - name: poison cloak - description: The purple color is a clear indicator you are poisonous. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/bi.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakBi +# name: poison cloak +# description: The purple color is a clear indicator you are poisonous. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/bi.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakIntersex - name: cyclops cloak - description: The circle on this cloak represents a cyclops' eye. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/intersex.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakIntersex +# name: cyclops cloak +# description: The circle on this cloak represents a cyclops' eye. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/intersex.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakLesbian - name: poet cloak - description: This cloak belonged to an ancient poet, you forgot which one. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/les.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakLesbian +# name: poet cloak +# description: This cloak belonged to an ancient poet, you forgot which one. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/les.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakGay - name: multi-level marketing cloak - description: This cloak is highly sought after in the Nanotrasen Marketing Offices. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/gay.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakGay +# name: multi-level marketing cloak +# description: This cloak is highly sought after in the Nanotrasen Marketing Offices. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/gay.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakEnby - name: treasure hunter cloak - description: This cloak belonged to a greedy treasure hunter. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/enby.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakEnby +# name: treasure hunter cloak +# description: This cloak belonged to a greedy treasure hunter. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/enby.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakPan - name: chef's cloak - description: Meant to be worn alongside a frying pan. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/pan.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakPan +# name: chef's cloak +# description: Meant to be worn alongside a frying pan. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/pan.rsi +#- type: entity +# parent: ClothingNeckBase +# id: ClothingNeckCloakTrans +# name: vampire cloak +# description: Worn by high ranking vampires of the transylvanian society of vampires. +# components: +# - type: Sprite +# sprite: Clothing/Neck/Cloaks/trans.rsi +# Corvax-end diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index a7dcf03f28c..fefbd3e8113 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -12,115 +12,117 @@ - type: Clothing sprite: Clothing/Neck/Misc/pins.rsi -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLGBTPin - name: LGBT pin - description: Be gay do crime. - components: - - type: Sprite - state: lgbt - - type: Clothing - equippedPrefix: lgbt +# Corvax-start +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckLGBTPin +# name: LGBT pin +# description: Be gay do crime. +# components: +# - type: Sprite +# state: lgbt +# - type: Clothing +# equippedPrefix: lgbt -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAromanticPin - name: aromantic pin - description: Be aro do crime. - components: - - type: Sprite - state: aro - - type: Clothing - equippedPrefix: aro +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckAromanticPin +# name: aromantic pin +# description: Be aro do crime. +# components: +# - type: Sprite +# state: aro +# - type: Clothing +# equippedPrefix: aro -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAsexualPin - name: asexual pin - description: Be ace do crime. - components: - - type: Sprite - state: asex - - type: Clothing - equippedPrefix: asex +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckAsexualPin +# name: asexual pin +# description: Be ace do crime. +# components: +# - type: Sprite +# state: asex +# - type: Clothing +# equippedPrefix: asex -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckBisexualPin - name: bisexual pin - description: Be bi do crime. - components: - - type: Sprite - state: bi - - type: Clothing - equippedPrefix: bi +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckBisexualPin +# name: bisexual pin +# description: Be bi do crime. +# components: +# - type: Sprite +# state: bi +# - type: Clothing +# equippedPrefix: bi -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckGayPin - name: gay pin - description: Be gay~ do crime. - components: - - type: Sprite - state: gay - - type: Clothing - equippedPrefix: gay +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckGayPin +# name: gay pin +# description: Be gay~ do crime. +# components: +# - type: Sprite +# state: gay +# - type: Clothing +# equippedPrefix: gay -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckIntersexPin - name: intersex pin - description: Be intersex do crime. - components: - - type: Sprite - state: inter - - type: Clothing - equippedPrefix: inter +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckIntersexPin +# name: intersex pin +# description: Be intersex do crime. +# components: +# - type: Sprite +# state: inter +# - type: Clothing +# equippedPrefix: inter -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLesbianPin - name: lesbian pin - description: Be lesbian do crime. - components: - - type: Sprite - state: les - - type: Clothing - equippedPrefix: les +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckLesbianPin +# name: lesbian pin +# description: Be lesbian do crime. +# components: +# - type: Sprite +# state: les +# - type: Clothing +# equippedPrefix: les -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckNonBinaryPin - name: non-binary pin - description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" - components: - - type: Sprite - state: non - - type: Clothing - equippedPrefix: non +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckNonBinaryPin +# name: non-binary pin +# description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" +# components: +# - type: Sprite +# state: non +# - type: Clothing +# equippedPrefix: non -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckPansexualPin - name: pansexual pin - description: Be pan do crime. - components: - - type: Sprite - state: pan - - type: Clothing - equippedPrefix: pan +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckPansexualPin +# name: pansexual pin +# description: Be pan do crime. +# components: +# - type: Sprite +# state: pan +# - type: Clothing +# equippedPrefix: pan -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckTransPin - name: transgender pin - description: Be trans do crime. - components: - - type: Sprite - state: trans - - type: Clothing - equippedPrefix: trans +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckTransPin +# name: transgender pin +# description: Be trans do crime. +# components: +# - type: Sprite +# state: trans +# - type: Clothing +# equippedPrefix: trans +# Corvax-end - type: entity parent: ClothingNeckPinBase diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index eb802487ca0..19d2c466d98 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -140,18 +140,20 @@ # Pins - !type:GroupSelector children: - - id: ClothingNeckLGBTPin - - id: ClothingNeckAromanticPin - - id: ClothingNeckAsexualPin - - id: ClothingNeckBisexualPin - - id: ClothingNeckGayPin - - id: ClothingNeckIntersexPin - - id: ClothingNeckLesbianPin - - id: ClothingNeckNonBinaryPin - - id: ClothingNeckPansexualPin - - id: ClothingNeckTransPin - - id: ClothingNeckAutismPin - - id: ClothingNeckGoldAutismPin + # Corvax-start + #- id: ClothingNeckLGBTPin + #- id: ClothingNeckAromanticPin + #- id: ClothingNeckAsexualPin + #- id: ClothingNeckBisexualPin + #- id: ClothingNeckGayPin + #- id: ClothingNeckIntersexPin + #- id: ClothingNeckLesbianPin + #- id: ClothingNeckNonBinaryPin + #- id: ClothingNeckPansexualPin + #- id: ClothingNeckTransPin + #- id: ClothingNeckAutismPin + #- id: ClothingNeckGoldAutismPin + # Corvax-end # Corvax-Pins-Start - id: ClothingNeckUSSPPin - id: ClothingNeckDonkPin @@ -162,6 +164,16 @@ - id: ClothingNeckNanoTrasenPin - id: ClothingNeckSyndicakePin - id: ClothingNeckVitezstviPin + - id: ClothingNeckRainbowPin + - id: ClothingNeckPilotPin + - id: ClothingNeckWerewolfPin + - id: ClothingNeckPoisonPin + - id: ClothingNeckCyclopePin + - id: ClothingNeckPoetPin + - id: ClothingNeckMarketingPin + - id: ClothingNeckProspectorPin + - id: ClothingNeckChiefPin + - id: ClothingNeckVampirePin # Corvax-Pins-End # Rare Group - !type:GroupSelector diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 861caddd064..8825a0f2fe2 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -194,8 +194,12 @@ orGroup: GiftPool - id: ViolaInstrument orGroup: GiftPool - - id: ClothingNeckCloakTrans + # Corvax-start + #- id: ClothingNeckCloakTrans + # orGroup: GiftPool + - id: ClothingNeckCloakVampire orGroup: GiftPool + # Corvax-end - id: ClothingNeckCloakAdmin orGroup: GiftPool - id: ToySkeleton diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 6df1a39dc8c..bef45215288 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -34,17 +34,19 @@ - type: Item sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi -- type: entity - parent: BaseItem - id: LGBTQHandyFlag - name: LGBTQ handheld flag - description: "The be gay do crime handy flag." - components: - - type: Sprite - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - state: icon - - type: Item - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi +# Corvax-start +#- type: entity +# parent: BaseItem +# id: LGBTQHandyFlag +# name: LGBTQ handheld flag +# description: "The be gay do crime handy flag." +# components: +# - type: Sprite +# sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi +# state: icon +# - type: Item +# sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi +# Corvax-end - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 70d59cbb2da..2d65acfbf58 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -53,9 +53,11 @@ components: - type: StorageFill contents: - - id: ClothingNeckLGBTPin - prob: 0.06 - orGroup: dressermainloot + # Corvax-start + #- id: ClothingNeckLGBTPin + # prob: 0.06 + # orGroup: dressermainloot + # Corvax-end # Corvax-Pins-Start - id: ClothingNeckAtharaPin prob: 0.06 @@ -84,6 +86,9 @@ - id: ClothingNeckWhiteListPin prob: 0.06 orGroup: dressermainloot + - id: ClothingNeckRainbowPin + prob: 0.06 + orGroup: dressermainloot # Corvax-Pins-End - id: ClothingUniformJumpsuitColorGrey prob: 0.06 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index 992f7a71e6f..d4f8690016c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -35,15 +35,17 @@ components: - type: Sprite state: syndie_flag - -- type: entity - parent: BaseFlag - id: LGBTQFlag - name: LGBTQ flag - description: "\"Be gay do crime\" flag." - components: - - type: Sprite - state: lgbtq_flag + +# Corvax-start +#- type: entity +# parent: BaseFlag +# id: LGBTQFlag +# name: LGBTQ flag +# description: "\"Be gay do crime\" flag." +# components: +# - type: Sprite +# state: lgbtq_flag +# Corvax-end - type: entity parent: BaseFlag diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 115bb3d10e9..c4c9e7b1a19 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -91,65 +91,67 @@ - CigarGold # Pins -- type: loadout - id: ClothingNeckLGBTPin - storage: - back: - - ClothingNeckLGBTPin - -- type: loadout - id: ClothingNeckAromanticPin - storage: - back: - - ClothingNeckAromanticPin - -- type: loadout - id: ClothingNeckAsexualPin - storage: - back: - - ClothingNeckAsexualPin - -- type: loadout - id: ClothingNeckBisexualPin - storage: - back: - - ClothingNeckBisexualPin - -- type: loadout - id: ClothingNeckGayPin - storage: - back: - - ClothingNeckGayPin - -- type: loadout - id: ClothingNeckIntersexPin - storage: - back: - - ClothingNeckIntersexPin - -- type: loadout - id: ClothingNeckLesbianPin - storage: - back: - - ClothingNeckLesbianPin - -- type: loadout - id: ClothingNeckNonBinaryPin - storage: - back: - - ClothingNeckNonBinaryPin - -- type: loadout - id: ClothingNeckPansexualPin - storage: - back: - - ClothingNeckPansexualPin - -- type: loadout - id: ClothingNeckTransPin - storage: - back: - - ClothingNeckTransPin +# Corvax-start +#- type: loadout +# id: ClothingNeckLGBTPin +# storage: +# back: +# - ClothingNeckLGBTPin + +#- type: loadout +# id: ClothingNeckAromanticPin +# storage: +# back: +# - ClothingNeckAromanticPin + +#- type: loadout +# id: ClothingNeckAsexualPin +# storage: +# back: +# - ClothingNeckAsexualPin + +#- type: loadout +# id: ClothingNeckBisexualPin +# storage: +# back: +# - ClothingNeckBisexualPin + +#- type: loadout +# id: ClothingNeckGayPin +# storage: +# back: +# - ClothingNeckGayPin + +#- type: loadout +# id: ClothingNeckIntersexPin +# storage: +# back: +# - ClothingNeckIntersexPin + +#- type: loadout +# id: ClothingNeckLesbianPin +# storage: +# back: +# - ClothingNeckLesbianPin + +#- type: loadout +# id: ClothingNeckNonBinaryPin +# storage: +# back: +# - ClothingNeckNonBinaryPin + +#- type: loadout +# id: ClothingNeckPansexualPin +# storage: +# back: +# - ClothingNeckPansexualPin + +#- type: loadout +# id: ClothingNeckTransPin +# storage: +# back: +# - ClothingNeckTransPin +# Corvax-end - type: loadout id: ClothingNeckAutismPin diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7c977e5b448..36775ae49dd 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -18,18 +18,20 @@ - CigPackBlack - CigarCase - CigarGold - - ClothingNeckLGBTPin - - ClothingNeckAromanticPin - - ClothingNeckAsexualPin - - ClothingNeckBisexualPin - - ClothingNeckGayPin - - ClothingNeckIntersexPin - - ClothingNeckLesbianPin - - ClothingNeckNonBinaryPin - - ClothingNeckPansexualPin - - ClothingNeckTransPin - - ClothingNeckAutismPin - - ClothingNeckGoldAutismPin + # Corvax-start + #- ClothingNeckLGBTPin + #- ClothingNeckAromanticPin + #- ClothingNeckAsexualPin + #- ClothingNeckBisexualPin + #- ClothingNeckGayPin + #- ClothingNeckIntersexPin + #- ClothingNeckLesbianPin + #- ClothingNeckNonBinaryPin + #- ClothingNeckPansexualPin + #- ClothingNeckTransPin + #- ClothingNeckAutismPin + #- ClothingNeckGoldAutismPin + # Corvax-end # Corvax-Loadouts-Start - ClothingNeckAtharaPin - ClothingNeckCorvaxPin @@ -40,6 +42,16 @@ - ClothingNeckNovaPin - ClothingNeckSolarisPin - ClothingNeckWhiteListPin + - ClothingNeckRainbowPin + - ClothingNeckPilotPin + - ClothingNeckWerewolfPin + - ClothingNeckPoisonPin + - ClothingNeckCyclopePin + - ClothingNeckPoetPin + - ClothingNeckMarketingPin + - ClothingNeckProspectorPin + - ClothingNeckChiefPin + - ClothingNeckVampirePin # Corvax-Loadouts-End - TowelColorBlack - TowelColorDarkBlue diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png deleted file mode 100644 index 1bdd3de51e38027300d545a62cd95b3425cd3031..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=@t!V@Ar*7pUfL+=5Fo;E(A;Sz z7st_C0o@_$b;4c&&0;-%^Q2tv_uS>u+ra@;e{c8nZ867Ze7`j9mTqZ|Z&~&Hji!;- pOS>$u8Tq82+xYJbPz@YB$d+Tu7s!?DX}<~*^K|udS?83{1OTWAF|HZU-_A+gt8P~4VXu;0>a*76x1r3^=k^w=z! zSuNT+Co+2!y}hJ$@c*>FM?76^S`tOy&)-i>00N7B|5cq!ZdWfltE$big44r`IrIH} ze?Y#LVPov3CayT}3NEjwD++>|-?kwr$xMk|X?wrkT2Q|PR;n84Vh>td&S7RjT Q4D=;~r>mdKI;Vst0M9dN-~a#s diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index 0619f962df3..bfd1a08a45b 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,26 +1,12 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark", + "copyright": "by Terraspark", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "aro" - }, - { - "name": "aro-equipped-NECK", - "directions": 4 - }, - { - "name": "asex" - }, - { - "name": "asex-equipped-NECK", - "directions": 4 - }, { "name": "autism" }, @@ -28,68 +14,12 @@ "name": "autism-equipped-NECK", "directions": 4 }, - { - "name": "bi" - }, - { - "name": "bi-equipped-NECK", - "directions": 4 - }, - { - "name": "gay" - }, - { - "name": "gay-equipped-NECK", - "directions": 4 - }, { "name": "goldautism" }, { "name": "goldautism-equipped-NECK", "directions": 4 - }, - { - "name": "inter" - }, - { - "name": "inter-equipped-NECK", - "directions": 4 - }, - { - "name": "les" - }, - { - "name": "les-equipped-NECK", - "directions": 4 - }, - { - "name": "lgbt" - }, - { - "name": "lgbt-equipped-NECK", - "directions": 4 - }, - { - "name": "non" - }, - { - "name": "non-equipped-NECK", - "directions": 4 - }, - { - "name": "pan" - }, - { - "name": "pan-equipped-NECK", - "directions": 4 - }, - { - "name": "trans" - }, - { - "name": "trans-equipped-NECK", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/chief.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/cyclope.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/marketing.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/pilot.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poet.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/poison.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/les.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/prospector.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/vampire.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/Neck/Cloaks/werewolf.rsi/meta.json diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/chief-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/chief-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/chief.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/chief.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/cyclope-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/cyclope-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/cyclope.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/cyclope.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/marketing-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/marketing-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/marketing.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/marketing.png diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json index b3fcfe0cacb..a0bcd6db166 100644 --- a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Lore's pixels made by @no_mad#0260, servers pins made by @mishutka09", + "copyright": "Lore's pixels made by @no_mad#0260, servers pins made by @mishutka09, [warewolf, pilot, poison, marketing, cyclope, poet, rainbow, prospector, chief, vampire] made by PixelTK, rainbow modified by Ko4erga", "size": { "x": 32, "y": 32 @@ -28,14 +28,14 @@ "name": "cor-equipped-NECK", "directions": 4 }, - { + { "name": "donk" }, { "name": "donk-equipped-NECK", "directions": 4 }, - { + { "name": "earth" }, { @@ -56,7 +56,7 @@ "name": "ely-equipped-NECK", "directions": 4 }, - { + { "name": "logistika" }, { @@ -70,21 +70,21 @@ "name": "main-equipped-NECK", "directions": 4 }, - { + { "name": "med" }, { "name": "med-equipped-NECK", "directions": 4 }, - { + { "name": "nakamura" }, { "name": "nakamura-equipped-NECK", "directions": 4 }, - { + { "name": "nano" }, { @@ -105,7 +105,7 @@ "name": "nova-equipped-NECK", "directions": 4 }, - { + { "name": "sind" }, { @@ -119,7 +119,7 @@ "name": "sol-equipped-NECK", "directions": 4 }, - { + { "name": "vit" }, { @@ -132,6 +132,76 @@ { "name": "wl-equipped-NECK", "directions": 4 + }, + { + "name": "warewolf" + }, + { + "name": "warewolf-equipped-NECK", + "directions": 4 + }, + { + "name": "pilot" + }, + { + "name": "pilot-equipped-NECK", + "directions": 4 + }, + { + "name": "poison" + }, + { + "name": "poison-equipped-NECK", + "directions": 4 + }, + { + "name": "marketing" + }, + { + "name": "marketing-equipped-NECK", + "directions": 4 + }, + { + "name": "cyclope" + }, + { + "name": "cyclope-equipped-NECK", + "directions": 4 + }, + { + "name": "poet" + }, + { + "name": "poet-equipped-NECK", + "directions": 4 + }, + { + "name": "rainbow" + }, + { + "name": "rainbow-equipped-NECK", + "directions": 4 + }, + { + "name": "prospector" + }, + { + "name": "prospector-equipped-NECK", + "directions": 4 + }, + { + "name": "chief" + }, + { + "name": "chief-equipped-NECK", + "directions": 4 + }, + { + "name": "vampire" + }, + { + "name": "vampire-equipped-NECK", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/pilot-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/pilot-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/pilot.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/pilot.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poet-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poet-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poet.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poet.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poison-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poison-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poison.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/poison.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/prospector-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/prospector-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/prospector.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/prospector.png diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow-equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..8df052c4b51903d6d639f8c2700f75d7a95113a7 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|l001;Ln`LH zy<{lZ;vm3qP}gZwID?|0nIE^N(FqG-4+mzkeFdA=KU}=HE00y!hXttR|L*Dg>dtGv zU%Gy6^sO7a|HwEW+m`-%ikjD&(mCsOHtzcZR09VOGVA;T1%A5nrARhm*>*|i9cI;{7)Knw}$X~uaW#`Y+zt;Lt?MHptvo&V85l; ztmQL2N*Rt6>9JWdvs$!uPGt5ddV5Lh;QwiTk9fM;v?PkYpTD1&00b8M{;N8d+^$}9 zR#ls21*eA>bLRW|#x;AtPIUZmxSVI__w{lh!wm}d|97`$ubF!H#DN3L&wYpskq!QI z+;_#S**rWv|6FE!7F~OIb;i&58K+wu10&@0%KpD~W&?t@?f1_a)a;w+H)*Cyy7LUz zBOQXwC-ge@NS+GdTC|oYHf6Rcm)k)NkOv(Y8SW-no%Px$ut`KgR9J=W)jdnYKpY0}Cw-x{ND*6I3K?r%-GswI5SMNaR!|(fxLEuGE)F8@ zog7?T`T<0668r`=EfgUjVjHCtbTW-YOfShL>0L0TLZ2n+-T&@>y&MTJ%YO+W#3+?Y z#$V5y5FJpLWluy^Ri%jl=HqdsBy+7?f({Q069)LDm`;1PyJ2pSFko)|8L8hauLu5nKR5h@oj(U`=MT?b+@J69QN{TT?{J0kE)i4}cmHFf5x_J!M|s0OWJ# zef&n)CJyk5_HH8dig&*qru2Zr2Erf0qZWOhQj*S7Uu^-PyJ3$VHf#fEIQz!}90%}q zk9NrPuT`H`m~jo#8aFi`z)F8(*YVp>E0D5DXVJp-=yvCUMd^cY0G)7vrN;u(rfqj! z$^&1JU$_BV9|Hiu-C}msmcLyNM%h4m>(23)?JNB~g71@q1iLRp|#e;>dp zGjHIB!hQf1Me(hz6@pO!pzEJ#Hjl&YK+xg<-5m$YwNqX-+<-9gThN_YQ~=&gFM#J0 s94WxcxC0nDAnHsnU=q)NmRSJc2c6S}FcPx$iAh93RCt{2+Pg}`Ko|w!<7%OxT?m4*O$z4)?EY44w6Nbs_5lQu#fK1k!O{n? z5J7AMvbBO~Yy`VSRuK^;8H;FKt2L9EO$N_bg@g?MTylXq01*)p5fPbEN@)?%b=P5H zrpnEyQKSK2-%c&Hm@>KPyW?|mSDf4FD+ED+IF60ltV^jCaMW)9>Ug>}aDQyb(E-j*Y}Z#15$$4il^TF-9Y{lp@?Xul+!=VmaB$c7fwV( zL_|bHL_|bH^pDs|rBq6Y)WLQt#hWcISE-c7uK?Gnl*SK$>r_hP2Vh((<+|dwxfkz% zajBFl+x3lK0f5_7iWe&Y_**K)Rg%mLKF4*5h=_=4@d?u)nvz7E8~6YK002ovPDHLk FV1iO+&eZ?_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-right.png b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..135cdefb58069427829ba884131ca792d346935b GIT binary patch literal 524 zcmV+n0`vWeP)Px$#z{m$RCt{2+P`btKp4jHukBE12uUf%OQ00A+z`*jaBB&a4)yL1p(Wiz{sFJW z1TxlOGGs0!W9aHXp@TAbF*Ue~mXJb+l3WKz4s@vXD_AnmXEKLnzk2V`9q0iO5fKp) ziNjj!j4^K6b>yX*_QEsIb7!7c`bJceeA!y-!Z76cl|LW*J@f#0HyS1St)f^g|r;IV~&CN#uzCGUrpjv%G@cIV;x78DZ z&&z)f7-L+$UMKD>)_0&qaj0j$?HIKOBBaMkJn-NXeiTc#O1*zV1@!K2CH z(q})CWEG^^1tLYd=|^F$E$uexX8?Qq+5h7)<&qC5 za$;nWTndaDv0mHYd~3F`T(u@l``y)R!2eQMMNN$4s_X|J5fKp)x%U?hn4#(U^mSMO O0000Px%T}ebiR9J=Wl|N_`Q5?rVmt1p~Sco(gVj8qo+74>ATSOGZ#i=?dB8~+I9h@Ah zqb=y$(IWH5W}PiesQz5m^S{eX;0;&&knI0CLr;D{dP| z8HTeN*rWDcJ@1=q;s>s58Nm0>2AXyK z^Q`OJA0FYwiI1LOmp>e*R;aW@JKyv!1G~lZnAgD-=aX0&T=n}IXGO`?X$O4#Q#uoVbMe4Fq6Y9CpaD3^n6@wtLYrfibz zXP~)2mTCaJ+V6J(yz1gFQD3#pt~njM%|{np+l(tm0SL?DwR$$@Z!ZF_<^`}&%>%Gu ze08laXO`M{p0?9!=-583W8SAfdSBq44D>VfFTkOO8fvIk{RNr`#8lZQjlci^002ov JPDHLkV1gwJL0bR- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png index ff4e3eb2cf6b65269e9c3cf7c3c8a6b45eed18af..e82efa4a55962206dade0baad46787a3f228a268 100644 GIT binary patch delta 487 zcmVE0D5DXVJp-=yvCUMd^cY0G)7vrN;u(rfqj!$^&1JU$_BV9|Hiu-C}ms zmcLyNM%h4m>(23)?JNB~g71@q1iLRp|#e_$WLDKl^2hr)gU6-Du_trdb% z0HEuiXf}_-?Lg4t0Nou2%C%EoHQazO@mtWHSX2PsOfP`v6C5eP%D4jPfNLu00#+)_owHA+hR)zsESF>H-vIGMq)FqmP@GKNiS8IB!bm_Lg_qFzn1MO{~S zmROl`k#vu~{sJwnexNZQ?!M3gQeq`Re!>5NpdLh^00zcO2c7_xa29w(7BevL9RguS zQ4OyKpx_2i7sn6_|E(7tg$^n3I0Rm}lytC5z>wQ^P|!_)xQYq^)BHa9HNaPVLY;a`(3u={9$B z7#ctBW7H7ZST6HesL5LH_{WA#nT&5d6Ba~0SkW}k;<&ELlJ7nX!f(xYFVdQ I&MBb@039orZU6uP diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png index 63005e54161eccb37066b8858822d7cf136add46..039f2208c2c68dc55f0defcb5dc4e89d57e11ff3 100644 GIT binary patch delta 448 zcmV;x0YCnd1J47H8Gi-<0063Kaozv`00DDSM?wIu&K&6g00D_fL_t(|obB4XO2j}I z1>oaqp`cv|g0f8t=LPKkR&2De-$wQU1d+vu5PQMW2e1%9Yy+~jf@y37yG2$J5hWRm zXk4o`lbKBh&sT+n4F6nmfjIyX5fKp)nNmt=5z%$mVPdAr&3~s+qyb>xPA#>VGP&uy z<8yLXoZIOu1VMl}j*Z%^OQ{ub)NcRkc)B%mv2U-aNh&n}v#a-5od4-~_f`Sv*Q3AD z0nScr*H;h`?P7J68h~saNJF4|vyz_}c8Y7kMTigNFT^BCym<^t7aH~=J)Ldm$Ct~< zvUdQ$+T$|-;D3DK7`6vMMD$=Vu--0U@D*qcI|!~q0Kn$c8(z~F0KnnHo;R~T%Bbkw zrGw&|@4DkIXCE;95Ab!iC$8$>p@?Xul+!=VmaB$c7fwV(L_|bHL_|bH^pDs|rBq6Y z)WLQt#hWcISE-c7uK?Gnl*SK$>r_hP2Vh((<+|dwxj7f_fN`mmD%NS%G}B0G|+7 z4Gj$&8=IMOavPMDcg8a;3})E2fkC2PZT>6<$#xCN7Ij_SSz=|%`uYosq4nJ@ErnSMo|r~2B6?^PZ!6K2=}+w zF7h=Q@UULkcy{G%zu*7uwT+o?W^8Od^5eqqBOJE;tu5IP5<~(PJdtNKzQP?>b>NnB z!`5?_GdHlD+VQ>4zCdcZGsp9OY}_GI%jH zxQdpLLWh!E2S*NcsP!vYGS6o+hh@Kd@6a9S0TB@q5fO>QT7T<|F>cv)$e>~d_SEH)G7?xv(@mDG1FhbIPVgZvDUiba2R_MVmBaq@YOFGguCzO<54pP z?Mv>)_0&qaj0j$?HIKOBBaMkJn-NXeiTc#O1*zV1@!K2CH(q})CWEG^^1tLYd=|^F$ zE$u@ex&3NtCo>o%>eY@NU|1N;psPDevPE5Hvd;Wj3`NpC`uYpR%9Ly5W@u^k z1GR=XG)My}p^_lK;Qwf#{y)Q`{riQ0(wqezk;M!Qe1|}oQB=dL0VsIf)5S3)!u{>F z(|k;dJgtcm0*)UqeXoyH)I61Hperma{@47FN}XDonESzlECLGO(;F^TBwS&<-R53o zx?qc8oA;K6t<$`(G}u`_pHz74_m*ejAB~r8<$pM-N84_O8FSK?>VIN~WZ!=-`MOq$ zx#Q!*zry;TpE;;0&D$5sY3q>9p5P?^koUvAM}iT442(rg920~eh%=NgeZ%njx5Du_ zP2~eInzjycnoA$rFIYF_5<@_^S0=*>?WI>3Di*F4S;N}rcXuj_00YAV)~Po+uX}P_ R`2h42gQu&X%Q~loCIIczn0){M diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json index 7fc21e61ab4..4f156ef168c 100644 --- a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Saveliy360", + "copyright": "Drawn by Saveliy360, modified by Ko4erga (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png deleted file mode 100644 index 36237bb4599b0c16cbad3063a778e5b1afa9cd00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUO-)UclapJeq?Rfwu2E9jucp@P!LTlhVQU=2$qa_BHik9J7&fhC zICg+RI89!nUQMz^U1qY5s%nj{?ks)%1t}6$HF7gdO*b{j&+S)U4>YwXnd<|Pk}e7I z3;vH2FsPewn*x<_7I;J!GcfQS0b$0e+I-SL!84vNjv*HQPtV*IYf=zsO=K4RIAa#u zp8w6;(o%D*L83F=7 z%+%)EmC>8e;FYY!W+bDPd`ea!`*GWvrKdShsH~X1Y%f#p%v+r!OJ z=<=TV%i#jnwuSZwWP1x;l=q%@n9^i$Hoxh6`~n&+Bp!_}Q4 z7TdW5#GcIge*4Yd;*y7%%p!Abw)bCQ)R=X|W9frM`xzAXFf_#l>I!eU*$?y=gQu&X J%Q~loCICvZv(*3q diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json index 36d69f0e428..ced7cad70dc 100644 --- a/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "syndie_flag" }, - { - "name": "lgbtq_flag" - }, { "name": "pirate_flag" } diff --git a/Resources/migration.yml b/Resources/migration.yml index 92764a2d379..98192d6f703 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -451,3 +451,26 @@ BaseAdvancedPen: Pen # 2024-10-05 - Corvax SheetPrinter: SheetPaper SheetPrinter1: SheetPaper1 + +# 2024-11-11 - Corvax +LGBTQFlag: RainbowFlag +LGBTQHandyFlag: RainbowHandyFlag +ClothingNeckCloakAce: ClothingNeckCloakPilot +ClothingNeckCloakAro: ClothingNeckCloakWerewolf +ClothingNeckCloakBi: ClothingNeckCloakPoison +ClothingNeckCloakIntersex: ClothingNeckCloakCyclope +ClothingNeckCloakLesbian: ClothingNeckCloakPoet +ClothingNeckCloakGay: ClothingNeckCloakMarketing +ClothingNeckCloakEnby: ClothingNeckCloakProspector +ClothingNeckCloakPan: ClothingNeckCloakChief +ClothingNeckCloakTrans: ClothingNeckCloakVampire +ClothingNeckLGBTPin: ClothingNeckRainbowPin +ClothingNeckAsexualPin: ClothingNeckPilotPin +ClothingNeckAromanticPin: ClothingNeckWerewolfPin +ClothingNeckBisexualPin: ClothingNeckPoisonPin +ClothingNeckIntersexPin: ClothingNeckCyclopePin +ClothingNeckLesbianPin: ClothingNeckPoetPin +ClothingNeckGayPin: ClothingNeckMarketingPin +ClothingNeckNonBinaryPin: ClothingNeckProspectorPin +ClothingNeckPansexualPin: ClothingNeckChiefPin +ClothingNeckTransPin: ClothingNeckVampirePin From 7654f1513aef0ebf68258bd0d3bd122d570dd4ec Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 01:36:47 +0300 Subject: [PATCH 2/6] code clean --- Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml index 1b577e1dd90..2fef630f0f1 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -232,7 +232,6 @@ sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: wl -### - type: entity parent: ClothingNeckPinBase id: ClothingNeckRainbowPin From 8157929dc73319df947245e0cde486c80b1d2ca0 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 01:47:56 +0300 Subject: [PATCH 3/6] locale --- .../entities/clothing/neck/cloaks.ftl | 18 ----------------- .../entities/clothing/neck/pins.ftl | 20 ------------------- .../entities/objects/misc/handy_flags.ftl | 2 -- .../structures/wallmounts/signs/flags.ftl | 2 -- 4 files changed, 42 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl index a76ae3b96cc..196111e140b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl @@ -24,8 +24,6 @@ ent-ClothingNeckCloakAdmin = вех!-плащ .desc = Вех! ent-ClothingNeckCloakMiner = плащ шахтёра .desc = Его носят самые опытные шахтёры, способные сдвинуть горы и засыпать долины. -ent-ClothingNeckCloakTrans = вампирский плащ - .desc = Его носят высокопоставленные вампиры из трансильванского общества вампиров. ent-ClothingNeckCloakGoliathCloak = плащ голиафа .desc = Плащ голиафа, сделанный из шкуры выносливой фауны с далёкой планеты. Однако с течением времени его защитные свойства ослабли. ent-ClothingNeckCloakPirateCap = плащ капитана пиратов @@ -34,19 +32,3 @@ ent-ClothingNeckCloakMoth = плащ моли .desc = Плащ в виде крыльев моли - необычный и оригинальный элемент гардероба, способный привлечь внимание окружающих. Он изготовлен из тонкой ткани, имитирующей крылья моли, с мягкими и пушистыми краями. Плащ застёгивается на шее с помощью липучки и имеет капюшон в виде головы моли. ent-ClothingNeckCloakVoid = плащ пустоты .desc = Плащ тьмы. Для тех, кто перешёл на тёмную сторону силы. -ent-ClothingNeckCloakAce = плащ пилота - .desc = Плащ, вручаемый лучшим космическим асам Nanotrasen. -ent-ClothingNeckCloakAro = плащ вервольфа - .desc = Этот плащ позволяет окружающим понять, что вы - одинокий волк. -ent-ClothingNeckCloakBi = ядовитый плащ - .desc = Пурпурный цвет - явный признак того, что вы ядовиты. -ent-ClothingNeckCloakIntersex = плащ циклопа - .desc = Круг на этом плаще представляет собой глаз циклопа. -ent-ClothingNeckCloakLesbian = плащ поэта - .desc = Этот плащ принадлежал древнему поэту, вы забыли, какому именно. -ent-ClothingNeckCloakGay = плащ сетевого маркетинга - .desc = Этот плащ пользуется большим спросом в маркетинговых офисах Nanotrasen. -ent-ClothingNeckCloakEnby = плащ кладоискателя - .desc = Этот плащ принадлежал жадному искателю сокровищ. -ent-ClothingNeckCloakPan = поварской плащ - .desc = Предназначен для ношения вместе со сковородой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl index 929bb61b6d6..d108142d8c6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl @@ -1,25 +1,5 @@ ent-ClothingNeckPinBase = нагрудный значок .desc = Значок с булавкой. -ent-ClothingNeckLGBTPin = { ent-ClothingNeckPinBase } - .desc = Разноцветный металлический значок с булавкой. -ent-ClothingNeckAromanticPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckAsexualPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckBisexualPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckGayPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckIntersexPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckLesbianPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckNonBinaryPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckPansexualPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } -ent-ClothingNeckTransPin = { ent-ClothingNeckLGBTPin } - .desc = { ent-ClothingNeckLGBTPin.desc } ent-ClothingNeckAutismPin = значок "аутизм" .desc = Значок в честь дня распространения информации о проблеме аутизма. ent-ClothingNeckGoldAutismPin = золотой значок "аутизм" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/handy_flags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/handy_flags.ftl index 4a0e6e16cd9..21c3505011c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/handy_flags.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/handy_flags.ftl @@ -4,7 +4,5 @@ ent-NTHandyFlag = ручной флажок Nanotrasen .desc = Слава Nanotrasen! Подождите, они реально сделали ручной флажок для корпорации? ent-SyndieHandyFlag = ручной флажок Синдиката .desc = Для настоящих патриотов-бунтарей. Смерть Nanotrasen! -ent-LGBTQHandyFlag = разноцветный ручной флажок - .desc = Кусок разноцветной ткани, намотанный на палку. ent-PirateHandyFlag = пиратский ручной флажок .desc = Возьмите его в руки и покажите этим карпам, что вы не шутите. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/flags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/flags.ftl index b3df4079bc0..ccc0b72d937 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/flags.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/flags.ftl @@ -6,7 +6,5 @@ ent-NTFlag = флаг Nanotrasen .desc = Слава Nanotrasen! Подождите, они реально сделали флаг для корпорации? ent-SyndieFlag = флаг Синдиката .desc = Пахнет кровью. Смерть Nanotrasen! -ent-LGBTQFlag = разноцветный флаг - .desc = Кусок разноцветной ткани. ent-PirateFlag = пиратский флаг .desc = Поднять Весёлого Роджера, ублюдки! From 939298a2e111ecac983d662bd28cf3b4371f3c05 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 01:57:39 +0300 Subject: [PATCH 4/6] fix cloaks --- .../Markers/Spawners/Random/maintenance.yml | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 19d2c466d98..2e20f1c5a46 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -97,19 +97,30 @@ # Cloaks - !type:GroupSelector children: - - id: ClothingNeckCloakTrans + - id: ClothingNeckCloakGoliathCloak + - id: ClothingNeckCloakVoid - id: ClothingNeckCloakAdmin - id: ClothingNeckCloakMoth - - id: ClothingNeckCloakVoid - - id: ClothingNeckCloakGoliathCloak - - id: ClothingNeckCloakAce - - id: ClothingNeckCloakAro - - id: ClothingNeckCloakBi - - id: ClothingNeckCloakIntersex - - id: ClothingNeckCloakLesbian - - id: ClothingNeckCloakGay - - id: ClothingNeckCloakEnby - - id: ClothingNeckCloakPan + # Corvax-start + #- id: ClothingNeckCloakTrans + #- id: ClothingNeckCloakAce + #- id: ClothingNeckCloakAro + #- id: ClothingNeckCloakBi + #- id: ClothingNeckCloakIntersex + #- id: ClothingNeckCloakLesbian + #- id: ClothingNeckCloakGay + #- id: ClothingNeckCloakEnby + #- id: ClothingNeckCloakPan + - id: ClothingNeckCloakPilot + - id: ClothingNeckCloakWerewolf + - id: ClothingNeckCloakPoison + - id: ClothingNeckCloakCyclope + - id: ClothingNeckCloakPoet + - id: ClothingNeckCloakMarketing + - id: ClothingNeckCloakProspector + - id: ClothingNeckCloakChief + - id: ClothingNeckCloakVampire + # Corvax-end - id: ToySkeleton - id: Basketball - id: Football From a74827e593d8fbaa8be013f85cb926c082e074cf Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 02:00:15 +0300 Subject: [PATCH 5/6] change pins desc & name --- .../Corvax/Entities/Clothing/Neck/pins.yml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml index 2fef630f0f1..a981fbce342 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -235,8 +235,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckRainbowPin - name: значок радуги - description: Дождик кончился. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -248,8 +248,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPilotPin - name: значок пилота - description: Значок, вручаемый лучшим космическим асам Nanotrasen. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -261,8 +261,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckWerewolfPin - name: значок вервольфа - description: Этот значок позволяет окружающим понять, что вы - одинокий волк. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -274,8 +274,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPoisonPin - name: ядовитый значок - description: Пурпурный цвет - явный признак того, что вы ядовиты. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -287,8 +287,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckCyclopePin - name: значок циклопа - description: Круг на этом плаще представляет собой глаз циклопа. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -300,8 +300,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPoetPin - name: значок поэта - description: Этот значок принадлежал древнему поэту, вы забыли, какому именно. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -313,8 +313,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckMarketingPin - name: значок сетевого маркетинга - description: Этот значок пользуется большим спросом в маркетинговых офисах Nanotrasen. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -326,8 +326,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckProspectorPin - name: значок кладоискателя - description: Этот значок принадлежал жадному искателю сокровищ. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -339,8 +339,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckChiefPin - name: поварской значок - description: Предназначен для ношения вместе со сковородой. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -352,8 +352,8 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckVampirePin - name: вампирский плащ - description: Его носят высокопоставленные вампиры из трансильванского общества вампиров. + name: нагрудный значок + description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi From f674f23872ce1e3474d8851b63d9880a3fda78dd Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Tue, 12 Nov 2024 03:49:02 +0300 Subject: [PATCH 6/6] fix locale --- .../corvax/entities/clothing/neck/cloaks.ftl | 18 ++++++++++ .../entities/objects/misc/handy_flags.ftl | 2 ++ .../structures/wallmounts/signs/flags.ftl | 2 ++ .../Corvax/Entities/Clothing/Neck/cloaks.yml | 36 +++++++++---------- .../Corvax/Entities/Clothing/Neck/pins.yml | 20 ----------- .../Entities/Objects/Misc/handy_flags.yml | 4 +-- .../Structures/Wallmounts/Signs/flags.yml | 4 +-- 7 files changed, 44 insertions(+), 42 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/handy_flags.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/wallmounts/signs/flags.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/cloaks.ftl index 21351186a82..7fc2d69266c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/cloaks.ftl @@ -2,3 +2,21 @@ ent-ClothingNeckCloakCentcomBlack = плащ офицера специальны .desc = Вышитый золотом логотип компании Nanotrasen говорит сам за себя. ent-ClothingNeckCloakCentcomAdmiral = плащ адмирала .desc = Яркий зелёный плащ с золотым шитьём, который носят адмиралы флота Nanotrasen. +ent-ClothingNeckCloakPilot = плащ пилота + .desc = Плащ пилота, состоящий из полос черного, серого, белого и фиолетового цвета. Плащ, вручаемый лучшим космическим асам Nanotrasen. +ent-ClothingNeckCloakWerewolf = плащ вервольфа + .desc = Плащ вервольфа, состоящий из полос зелёного, белого, серого и черного цвета. Этот плащ позволяет окружающим понять, что вы - одинокий волк. +ent-ClothingNeckCloakPoison = ядовитый плащ + .desc = Ядовитый плащ, состоящий из полос пурпурного, фиолетового и синего цвета. Пурпурный цвет - явный признак того, что вы ядовиты. +ent-ClothingNeckCloakCyclope = плащ циклопа + .desc = Плащ циклопа, желтого цвета и кругом в центре. Круг на этом плаще представляет собой глаз циклопа. +ent-ClothingNeckCloakPoet = плащ поэта + .desc = Плащ поэта, состоящий из полос красного, белого и багряного цвета. Этот плащ принадлежал древнему поэту, вы забыли, какому именно. +ent-ClothingNeckCloakMarketing = плащ сетевого маркетинга + .desc = Плащ сетевого маркетинга, состоящий из полос бирюзового, белого и синего цвета. Этот плащ пользуется большим спросом в маркетинговых офисах Nanotrasen. +ent-ClothingNeckCloakProspector = плащ кладоискателя + .desc = Плащ кладоискателя, состоящий из полос желтого, белого, фиолетового и черного цвета. Этот плащ принадлежал жадному искателю сокровищ. +ent-ClothingNeckCloakChief = поварской плащ + .desc = Поварский плащ, состоящий из полос красного, желтого и голубого цвета. Предназначен для ношения вместе со сковородой. +ent-ClothingNeckCloakVampire = вампирский плащ + .desc = Вампирский плащ, состоящий из полос голубого, розового и белого цвета. Его носят высокопоставленные вампиры из трансильванского общества вампиров. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/handy_flags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/handy_flags.ftl new file mode 100644 index 00000000000..3d1b74c34c1 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/handy_flags.ftl @@ -0,0 +1,2 @@ +ent-RainbowHandyFlag = радужный ручной флажок + .desc = Дождик кончился. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/wallmounts/signs/flags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/wallmounts/signs/flags.ftl new file mode 100644 index 00000000000..ca9ddedca6e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/wallmounts/signs/flags.ftl @@ -0,0 +1,2 @@ +ent-RainbowFlag = флаг радуги + .desc = Дождик кончился. diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml index 5c883dd617d..ab115c98a74 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml @@ -19,8 +19,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakPilot - name: плащ пилота - description: Плащ, вручаемый лучшим космическим асам Nanotrasen. + name: pilot's cloak + description: A pilot's cloak consisting of stripes of black, gray, white and purple. The cape awarded to the best space aces of Nanotrasen. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/pilot.rsi @@ -28,8 +28,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakWerewolf - name: плащ вервольфа - description: Этот плащ позволяет окружающим понять, что вы - одинокий волк. + name: werewolf cloak + description: A werewolf cloak made up of stripes of green, white, grey and black. This cloak lets others know that you are a lone wolf. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/werewolf.rsi @@ -37,8 +37,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakPoison - name: ядовитый плащ - description: Пурпурный цвет - явный признак того, что вы ядовиты. + name: poison cloak + description: A poisonous cloak made up of stripes of purple, violet, and blue. The purple color is a clear sign that you are poisonous. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/poison.rsi @@ -46,8 +46,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakCyclope - name: плащ циклопа - description: Круг на этом плаще представляет собой глаз циклопа. + name: cyclops cloak + description: The cyclops' cloak is yellow and has a circle in the center. The circle on this cloak represents the cyclops' eye. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/cyclope.rsi @@ -55,8 +55,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakPoet - name: плащ поэта - description: Этот плащ принадлежал древнему поэту, вы забыли, какому именно. + name: poet's cloak + description: A poet's cloak, made of stripes of red, white and crimson. This cloak belonged to an ancient poet, you have forgotten which one. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/poet.rsi @@ -64,8 +64,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakMarketing - name: плащ сетевого маркетинга - description: Этот плащ пользуется большим спросом в маркетинговых офисах Nanotrasen. + name: network marketing cloak + description: A network marketing cape made up of stripes of turquoise, white and blue. This cape is in great demand in the Nanotrasen marketing offices. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/marketing.rsi @@ -73,8 +73,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakProspector - name: плащ кладоискателя - description: Этот плащ принадлежал жадному искателю сокровищ. + name: treasure hunter's cloak + description: A treasure hunter's cloak made up of stripes of yellow, white, purple and black. This cloak belonged to a greedy treasure hunter. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/prospector.rsi @@ -82,8 +82,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakChief - name: поварской плащ - description: Предназначен для ношения вместе со сковородой. + name: chef's cloak + description: A chef's cloak made of stripes of red, yellow and blue. Designed to be worn with a frying pan. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/chief.rsi @@ -91,8 +91,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakVampire - name: вампирский плащ - description: Его носят высокопоставленные вампиры из трансильванского общества вампиров. + name: vampire cloak + description: A vampire cloak made up of stripes of blue, pink, and white. It is worn by high-ranking vampires of the Transylvanian vampire society. components: - type: Sprite sprite: Corvax/Clothing/Neck/Cloaks/vampire.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml index a981fbce342..0e2c1885272 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -235,8 +235,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckRainbowPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -248,8 +246,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPilotPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -261,8 +257,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckWerewolfPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -274,8 +268,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPoisonPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -287,8 +279,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckCyclopePin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -300,8 +290,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckPoetPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -313,8 +301,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckMarketingPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -326,8 +312,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckProspectorPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -339,8 +323,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckChiefPin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi @@ -352,8 +334,6 @@ - type: entity parent: ClothingNeckPinBase id: ClothingNeckVampirePin - name: нагрудный значок - description: Самовыражайся! components: - type: Sprite sprite: Corvax/Clothing/Neck/Misc/pins.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml index 1c0cece235f..dc4fd4355a1 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseItem id: RainbowHandyFlag - name: флажок радуги - description: "Дождик кончился." + name: rainbow handheld flag + description: "The rain has stopped." components: - type: Sprite sprite: Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml index f86c0ddfb44..9289b7aa568 100644 --- a/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseFlag id: RainbowFlag - name: флаг радуги - description: "Дождик кончился." + name: rainbow flag + description: "The rain has stopped." components: - type: Sprite sprite: Corvax/Structures/Wallmounts/flags.rsi