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/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 = Поднять Весёлого Роджера, ублюдки! diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/cloaks.yml index 38f96995359..ab115c98a74 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: 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakWerewolf + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPoison + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakCyclope + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPoet + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakMarketing + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakProspector + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakChief + 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 + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakVampire + 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 a708f38c6fb..0e2c1885272 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml @@ -231,3 +231,113 @@ - type: Clothing sprite: Corvax/Clothing/Neck/Misc/pins.rsi equippedPrefix: wl + +- type: entity + parent: ClothingNeckPinBase + id: ClothingNeckRainbowPin + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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..dc4fd4355a1 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/handy_flags.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BaseItem + id: RainbowHandyFlag + name: rainbow handheld flag + description: "The rain has stopped." + 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..9289b7aa568 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/flags.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseFlag + id: RainbowFlag + name: rainbow flag + description: "The rain has stopped." + 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..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 @@ -140,18 +151,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 +175,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 1bdd3de51e3..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png deleted file mode 100644 index 8d48afe4488..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png and /dev/null differ 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 00000000000..8df052c4b51 Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow-equipped-NECK.png differ diff --git a/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow.png new file mode 100644 index 00000000000..c14c7c0c11a Binary files /dev/null and b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/rainbow.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/vampire-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/vampire-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/vampire.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/vampire.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/warewolf-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/warewolf-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png b/Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/warewolf.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png rename to Resources/Textures/Corvax/Clothing/Neck/Misc/pins.rsi/warewolf.png diff --git a/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/icon.png b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/icon.png new file mode 100644 index 00000000000..e82efa4a559 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/icon.png differ diff --git a/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-left.png b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-left.png new file mode 100644 index 00000000000..039f2208c2c Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-left.png differ 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 00000000000..135cdefb580 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/inhand-right.png differ diff --git a/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/meta.json b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/meta.json new file mode 100644 index 00000000000..4f156ef168c --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Misc/Handy_Flags/rainbow_handy_flag.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Saveliy360, modified by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/meta.json new file mode 100644 index 00000000000..22e4ec4459e --- /dev/null +++ b/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived by sprites from tgstation at https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 and adapted by Saveliy360, modified by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rainbow_flag" + } + ] +} diff --git a/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/rainbow_flag.png b/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/rainbow_flag.png new file mode 100644 index 00000000000..3ea08924207 Binary files /dev/null and b/Resources/Textures/Corvax/Structures/Wallmounts/flags.rsi/rainbow_flag.png differ 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 ff4e3eb2cf6..e82efa4a559 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png differ 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 63005e54161..039f2208c2c 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png index fbdf7c7e77f..135cdefb580 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png differ 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 36237bb4599..00000000000 Binary files a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png and /dev/null differ 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