diff --git a/Resources/Audio/_Sunrise/GW/goldenweh1.ogg b/Resources/Audio/_Sunrise/GW/goldenweh1.ogg new file mode 100644 index 00000000000..3ea68c8239f Binary files /dev/null and b/Resources/Audio/_Sunrise/GW/goldenweh1.ogg differ diff --git a/Resources/Audio/_Sunrise/GW/goldenweh2.ogg b/Resources/Audio/_Sunrise/GW/goldenweh2.ogg new file mode 100644 index 00000000000..d4b63be3e67 Binary files /dev/null and b/Resources/Audio/_Sunrise/GW/goldenweh2.ogg differ diff --git a/Resources/Audio/_Sunrise/GW/goldenweh3.ogg b/Resources/Audio/_Sunrise/GW/goldenweh3.ogg new file mode 100644 index 00000000000..f04713f6265 Binary files /dev/null and b/Resources/Audio/_Sunrise/GW/goldenweh3.ogg differ diff --git a/Resources/Audio/_Sunrise/GW/goldenweh4.ogg b/Resources/Audio/_Sunrise/GW/goldenweh4.ogg new file mode 100644 index 00000000000..03f55f0c4de Binary files /dev/null and b/Resources/Audio/_Sunrise/GW/goldenweh4.ogg differ diff --git a/Resources/Audio/_Sunrise/GW/goldenweh5.ogg b/Resources/Audio/_Sunrise/GW/goldenweh5.ogg new file mode 100644 index 00000000000..f6aa5a286e3 Binary files /dev/null and b/Resources/Audio/_Sunrise/GW/goldenweh5.ogg differ diff --git a/Resources/Audio/_Sunrise/Tovarish.ogg b/Resources/Audio/_Sunrise/Tovarish.ogg new file mode 100644 index 00000000000..9ce82ca78e9 Binary files /dev/null and b/Resources/Audio/_Sunrise/Tovarish.ogg differ diff --git a/Resources/Audio/_Sunrise/bye.ogg b/Resources/Audio/_Sunrise/bye.ogg new file mode 100644 index 00000000000..948f5aae626 Binary files /dev/null and b/Resources/Audio/_Sunrise/bye.ogg differ diff --git a/Resources/Audio/_Sunrise/not_for_long_weh.ogg b/Resources/Audio/_Sunrise/not_for_long_weh.ogg new file mode 100644 index 00000000000..dcbdb1c645c Binary files /dev/null and b/Resources/Audio/_Sunrise/not_for_long_weh.ogg differ diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl new file mode 100644 index 00000000000..1b4fd5e0c49 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl @@ -0,0 +1,10 @@ +ent-ClothingHeadBandOrange = orange bandana + .desc = { ent-ClothingHeadBandBase.desc } +ent-ClothingHeadBandYellow = yellow bandana + .desc = { ent-ClothingHeadBandBase.desc } +ent-ClothingHeadBandCyan = cyan bandana + .desc = { ent-ClothingHeadBandBase.desc } +ent-ClothingHeadBandWhite = white bandana + .desc = { ent-ClothingHeadBandBase.desc } +ent-ClothingHeadBandPurple = purple bandana + .desc = { ent-ClothingHeadBandBase.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/soft.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/soft.ftl new file mode 100644 index 00000000000..8808586f9a0 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/soft.ftl @@ -0,0 +1,4 @@ +ent-ClothingHeadHatBrown = brown cap + .desc = It's a baseball hat in a tasteless brown colour. +ent-ClothingHeadHatBrownsoftFlipped = brown cap + .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl new file mode 100644 index 00000000000..6a0dda8b540 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl @@ -0,0 +1,10 @@ +ent-ClothingMaskBandOrange = orange bandana + .desc = A orange bandana to make you look cool. +ent-ClothingMaskBandYellow = yellow bandana + .desc = A yellow bandana to make you look cool. +ent-ClothingMaskBandCyan = cyan bandana + .desc = A cyan bandana to make you look cool. +ent-ClothingMaskBandWhite = white bandana + .desc = A white bandana to make you look cool. +ent-ClothingMaskBandPurple = purple bandana + .desc = A purple bandana to make you look cool. \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl new file mode 100644 index 00000000000..c994e7798af --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl @@ -0,0 +1,5 @@ +ent-ClothingNeckScarfStripedYellow = striped yellow scarf + .desc = A stylish striped yellow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. + +ent-ClothingNeckScarfStripedCyan = striped cyan scarf + .desc = A stylish striped cyan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl new file mode 100644 index 00000000000..21063e8dca6 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl @@ -0,0 +1,2 @@ +ent-ClothingOuterFlannelWhite = white flannel jacket + .desc = An old fashioned white flannel jacket for space autumn. \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl index 14715ead7fa..58348562a31 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/toys.ftl @@ -130,3 +130,5 @@ ent-PlushieAgata = Plush Agent Agata Katsuhiro .desc = This plushie was made on a planetary prison by convicted Syndicate agents. Wear it proudly, corporate ent-PlushieMilosTanka = Plush Milos-Tanaka .desc = Unathi in a Central Command uniform, what could he possibly be hiding in him besides two knives and a revolver? +ent-LegendaryGoldenWeh = Legendary golden Weh + .desc = Do you remember how you made your way through the dangers, how you left a fake instead, accidentally activated a trap and started running away from a huge ball! But wait, it was a dream, then where did you get it? \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/_sunrise/loadout/loadouts.ftl b/Resources/Locale/en-US/_strings/_sunrise/loadout/loadouts.ftl index 8085adf4b77..4ef15fd368c 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/loadout/loadouts.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/loadout/loadouts.ftl @@ -41,6 +41,7 @@ MedicalDoctor-loadout = Снаряжение врача MedicalIntern-loadout = Снаряжение интерна Paramedic-loadout = Снаряжение парамедика SeniorPhysician-loadout = Снаряжение ведущего врача +MedicalPathologist-loadout = Снаряжение патологоанатома # Researching ResearchAssistant-loadout = Снаряжение научного ассистента Roboticist-loadout = Снаряжение робототехника diff --git a/Resources/Locale/en-US/_strings/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_strings/_sunrise/preferences/loadout-groups.ftl index 750d78db3c0..5b0ede9276c 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/preferences/loadout-groups.ftl @@ -14,6 +14,29 @@ loadout-group-centcomm-operator-head-hat = Головой убор ОЦК loadout-group-senior-officer-jumpsuit = Униформа инструктора СБ loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного loadout-group-senior-physician-jumpsuit = Униформа ведущего врача +loadout-group-senior-physician-head = Ведущий врач, голова +loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда +loadout-group-senior-physician-neck = Ведущий врач, шея +loadout-group-senior-physician-shoes = Ведущий врач, обувь +loadout-group-senior-physician-gloves = Ведущий врач, перчатки +loadout-group-chemist-head = Химик, голова +loadout-group-chemist-neck = Химик, шея +loadout-group-chemist-gloves = Химик, перчатки +loadout-group-chemist-shoes = Химик, обувь +loadout-group-psychologist-head = Психолог, голова +loadout-group-psychologist-outerclothing = Психолог, верхняя одежда +loadout-group-psychologist-neck = Психолог, шея +loadout-group-psychologist-gloves = Психолог, перчатки +loadout-group-psychologist-shoes = Психолог, обувь +loadout-group-paramedic-neck = Парамедик, шея +loadout-group-paramedic-gloves = Парамедик, перчатки +loadout-group-medical-doctor-neck = Врач, шея +loadout-group-pathologist-head = Патологоанатом, голова +loadout-group-pathologist-outerclothing = Патологоанатом, верхняя одежда +loadout-group-pathologist-neck = Патологоанатом, шея +loadout-group-pathologist-gloves = Патологоанатом, перчатки +loadout-group-pathologist-shoes = Патологоанатом, ботинки +loadout-group-medical-trinkets = Безделушки МЕД loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера loadout-group-chief-engineer-backpack = Старший инженер, рюкзак loadout-group-roboticist-head = Робототехник, головной убор @@ -32,4 +55,31 @@ loadout-group-adj-jumpsuit = Адъютант, комбинезон loadout-group-adj-backpack = Адъютант, рюкзак loadout-group-adj-head = Адъютант, головной убор loadout-group-adj-outerClothing = Адъютант, верхняя одежда -loadout-group-atmos-console = Атмос консоль +loadout-group-engineering-trinkets = Безделушки ИНЖ +loadout-group-senior-engineering-neck = Ведущий инженер, шея +loadout-group-senior-engineering-mask = Ведущий инженер, маска +loadout-group-senior-engineering-head = Ведущий инженер, голова +loadout-group-senior-engineering-shoes = Ведущий инженер, обувь +loadout-group-senior-engineering-outer-clothing = Ведущий инженер, верхняя одежда +loadout-group-senior-engineering-backpack = Ведущий инженер, рюкзак +loadout-group-senior-engineering-gloves = Ведущий инженер, перчатки +loadout-group-atmospheric-technician-mask = Атмосферный техник, маска +loadout-group-atmospheric-technician-neck = Атмосферный техник, шея +loadout-group-atmospheric-technician-head = Атмосферный техник, голова +loadout-group-atmospheric-technician-gloves = Атмосферный техник, перчатки +loadout-group-station-engineer-neck = Инженер, шея +loadout-group-station-engineer-mask = Инженер, маска +loadout-group-station-engineer-gloves = Инженер, перчатки +loadout-group-chief-engineer-gloves = Старший инженер, перчатки +loadout-group-chief-engineer-mask = Старший инженер, маска +loadout-group-quartermaster-gloves = Квартирмейстер, перчатки +loadout-group-quartermaster-mask = Квартирмейстер, маска +loadout-group-cargo-technician-gloves = Грузчик, перчатки +loadout-group-cargo-technician-mask = Грузчик, маска +loadout-group-cargo-technician-neck = Грузчик, шея +loadout-group-salvage-specialist-gloves = Утилизатор, перчатки +loadout-group-salvage-specialist-mask = Утилизатор, маска +loadout-group-salvage-specialist-neck = Утилизатор, шея +loadout-group-salvage-specialist-head = Утилизатор, голова +loadout-group-cargo-trinkets = Безделушки СНБ + diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl new file mode 100644 index 00000000000..70db60cb848 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/bandanas.ftl @@ -0,0 +1,11 @@ +ent-ClothingHeadBandYellow = жёлтая бандана + .desc = Жёлтая бандана, чтобы выглядеть круто. +ent-ClothingHeadBandOrange = оранжевая бандана + .desc = Оранжевая бандана, чтобы выглядеть круто. +ent-ClothingHeadBandCyan = голубая бандана + .desc = Голубая бандана, чтобы выглядеть круто. +ent-ClothingHeadBandPurple = фиолетовая бандана + .desc = Фиолетовая бандана, чтобы выглядеть круто. +ent-ClothingHeadBandWhite = белая бандана + .desc = Белая бандана, чтобы выглядеть круто. + diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/soft.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/soft.ftl new file mode 100644 index 00000000000..1684ed05156 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/soft.ftl @@ -0,0 +1,4 @@ +ent-ClothingHeadHatBrownsoft = коричневая кепка + .desc = Бейсболка безвкусного коричневого цвета. +ent-ClothingHeadHatBrownsoftFlipped = коричневая кепка + .desc = { ent-ClothingHeadHeadHatBaseFlipped.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl new file mode 100644 index 00000000000..94650eff7fd --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/masks/bandanas.ftl @@ -0,0 +1,10 @@ +ent-ClothingMaskBandOrange = оранжевая бандана + .desc = Оранжевая бандана, чтобы выглядеть круто. +ent-ClothingMaskBandYellow = жёлтая бандана + .desc = Жёлтая бандана, чтобы выглядеть круто. +ent-ClothingMaskBandCyan = голубая бандана + .desc = Голубая бандана, чтобы выглядеть круто. +ent-ClothingMaskBandPurple = фиолетовая бандана + .desc = фиолетовая бандана, чтобы выглядеть круто. +ent-ClothingMaskBandWhite = белая бандана + .desc = белая бандана, чтобы выглядеть круто. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl new file mode 100644 index 00000000000..5a6381c7fc3 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/neck/scarfs.ftl @@ -0,0 +1,5 @@ +ent-ClothingNeckScarfStripedYellow = полосатый жёлтый шарф + .desc = Стильный полосатый жёлтый шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто просто не выносит холодного ветра на своей шее. + +ent-ClothingNeckScarfStripedCyan = полосатый голубой шарф + .desc = Стильный полосатый голубой шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто просто не выносит холодного ветра на своей шее. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl new file mode 100644 index 00000000000..d3194d7c59f --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/misc.ftl @@ -0,0 +1,2 @@ +ent-ClothingOuterFlannelWhite = белая фланелевая куртка + .desc = Старомодная белая фланелевая куртка для космической осени. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl index f878d74a26b..f7152233bbc 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl @@ -136,3 +136,5 @@ ent-PlushieKaioshi = Плюшевый Кайоши Де Ле Грейтайд .desc = Бармен.. с бензопилой в руке?.. ent-PlushieRaisya = Плюшевая Раизя Фивуллина .desc = Мур! Мяу! Ня! её любимые словечки UwU +ent-LegendaryGoldenWeh = Легендарный золотой Вех + .desc = Вы помните как пробирались сквозь опасности, как оставили вместо него подделку, случайно активировали ловушку и начали убегать от огромного шара! Но погодите, это же был сон, тогда откуда он у вас? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/loadout/loadouts.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/loadout/loadouts.ftl index 8085adf4b77..4ef15fd368c 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/loadout/loadouts.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/loadout/loadouts.ftl @@ -41,6 +41,7 @@ MedicalDoctor-loadout = Снаряжение врача MedicalIntern-loadout = Снаряжение интерна Paramedic-loadout = Снаряжение парамедика SeniorPhysician-loadout = Снаряжение ведущего врача +MedicalPathologist-loadout = Снаряжение патологоанатома # Researching ResearchAssistant-loadout = Снаряжение научного ассистента Roboticist-loadout = Снаряжение робототехника diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl index 4717cec8849..d733a89c5a2 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl @@ -15,6 +15,29 @@ loadout-group-senior-officer-jumpsuit = Униформа инструктора loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного loadout-group-senior-physician-jumpsuit = Униформа ведущего врача loadout-group-senior-physician-belt = Ведущий врач, пояс +loadout-group-senior-physician-head = Ведущий врач, голова +loadout-group-senior-physician-outerclothing = Ведущий врач, верхняя одежда +loadout-group-senior-physician-neck = Ведущий врач, шея +loadout-group-senior-physician-shoes = Ведущий врач, обувь +loadout-group-senior-physician-gloves = Ведущий врач, перчатки +loadout-group-chemist-head = Химик, голова +loadout-group-chemist-neck = Химик, шея +loadout-group-chemist-gloves = Химик, перчатки +loadout-group-chemist-shoes = Химик, обувь +loadout-group-psychologist-head = Психолог, голова +loadout-group-psychologist-outerclothing = Психолог, верхняя одежда +loadout-group-psychologist-neck = Психолог, шея +loadout-group-psychologist-gloves = Психолог, перчатки +loadout-group-psychologist-shoes = Психолог, обувь +loadout-group-paramedic-neck = Парамедик, шея +loadout-group-paramedic-gloves = Парамедик, перчатки +loadout-group-medical-doctor-neck = Врач, шея +loadout-group-pathologist-head = Патологоанатом, голова +loadout-group-pathologist-outerclothing = Патологоанатом, верхняя одежда +loadout-group-pathologist-neck = Патологоанатом, шея +loadout-group-pathologist-gloves = Патологоанатом, перчатки +loadout-group-pathologist-shoes = Патологоанатом, ботинки +loadout-group-medical-trinkets = Безделушки МЕД loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера loadout-group-chief-engineer-backpack = Старший инженер, рюкзак loadout-group-roboticist-head = Робототехник, головной убор @@ -33,4 +56,29 @@ loadout-group-adj-jumpsuit = Адъютант, комбинезон loadout-group-adj-backpack = Адъютант, рюкзак loadout-group-adj-head = Адъютант, головной убор loadout-group-adj-outerClothing = Адъютант, верхняя одежда -loadout-group-atmos-console = Атмос консоль +loadout-group-engineering-trinkets = Безделушки ИНЖ +loadout-group-senior-engineering-neck = Ведущий инженер, шея +loadout-group-senior-engineering-mask = Ведущий инженер, маска +loadout-group-senior-engineering-head = Ведущий инженер, голова +loadout-group-senior-engineering-shoes = Ведущий инженер, обувь +loadout-group-senior-engineering-outer-clothing = Ведущий инженер, верхняя одежда +loadout-group-senior-engineering-backpack = Ведущий инженер, рюкзак +loadout-group-senior-engineering-gloves = Ведущий инженер, перчатки +loadout-group-atmospheric-technician-mask = Атмосферный техник, маска +loadout-group-atmospheric-technician-neck = Атмосферный техний, шея +loadout-group-atmospheric-technician-head = Атмосферный техник, голова +loadout-group-station-engineer-neck = Инженер, шея +loadout-group-station-engineer-mask = Инженер, маска +loadout-group-station-engineer-gloves = Инженер, перчатки +loadout-group-chief-engineer-gloves = Старший инженер, перчатки +loadout-group-chief-engineer-mask = Старший инженер, маска +loadout-group-quartermaster-gloves = Квартирмейстер, перчатки +loadout-group-quartermaster-mask = Квартирмейстер, маска +loadout-group-cargo-technician-gloves = Грузчик, перчатки +loadout-group-cargo-technician-mask = Грузчик, маска +loadout-group-cargo-technician-neck = Грузчик, шея +loadout-group-salvage-specialist-gloves = Утилизатор, перчатки +loadout-group-salvage-specialist-mask = Утилизатор, маска +loadout-group-salvage-specialist-neck = Утилизатор, шея +loadout-group-salvage-specialist-head = Утилизатор, голова +loadout-group-cargo-trinkets = Безделушки СНБ diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index a069833759d..0983b9d3223 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -8,10 +8,23 @@ ClothingBackpackSatchelLeather: 2 ClothingRandomSpawner: 8 ClothingHeadHatBeret: 4 +#sunrise-start + ClothingHeadBandWhite: 2 +#sunrise-end ClothingHeadBandBlack: 2 ClothingHeadBandBlue: 2 +#sunrise-start + ClothingHeadBandCyan: 2 + ClothingHeadBandYellow: 2 +#sunrise-end ClothingHeadBandGreen: 2 +#sunrise-start + ClothingHeadBandOrange: 2 +#sunrise-end ClothingHeadBandRed: 2 +#sunrise-start + ClothingHeadBandPurple: 2 +#sunrise-end ClothingHeadBandSkull: 2 ClothingHeadHatGreyFlatcap: 3 ClothingHeadHatBrownFlatcap: 3 @@ -66,6 +79,9 @@ ClothingShoesColorRed: 2 ClothingShoesColorPurple: 2 ClothingHeadHatGreysoft: 8 +#Sunrise-start + ClothingHeadHatBrownsoft: 2 +#Sunrise-end ClothingHeadHatMimesoft: 3 ClothingHeadHatBluesoft: 2 ClothingHeadHatYellowsoft: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac30..0b8b6ff146f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -7,6 +7,10 @@ ClothingNeckScarfStripedBlack: 3 ClothingNeckScarfStripedBrown: 3 ClothingNeckScarfStripedLightBlue: 3 +#sunrise-start + ClothingNeckScarfStripedCyan: 3 + ClothingNeckScarfStripedYellow: 3 +#sunrise-end ClothingNeckScarfStripedOrange: 3 ClothingNeckScarfStripedPurple: 3 ClothingOuterCoatTrench: 6 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index dcc2f115945..015c19acab0 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -184,6 +184,12 @@ orGroup: dressermainloot - id: ClothingNeckScarfStripedBlue prob: 0.03 +#sunrise-start + - id: ClothingNeckScarfStripedCyan + prob: 0.03 + - id: ClothingNeckScarfStripedYellow + prob: 0.03 +#sunrise-end orGroup: dressermainloot - id: ClothingNeckScarfStripedGreen prob: 0.03 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 67d8724b2cc..5a91436941a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1255,6 +1255,10 @@ - ClothingNeckScarfStripedRed - ClothingNeckScarfStripedBrown - ClothingNeckScarfStripedLightBlue +#sunrise-start + - ClothingNeckScarfStripedCyan + - ClothingNeckScarfStripedYellow +#sunrise-end - ClothingNeckScarfStripedOrange - ClothingNeckScarfStripedBlack - ClothingNeckScarfStripedPurple diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 844a66f7059..648c77b3e84 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -597,6 +597,22 @@ loadouts: - QuartermasterHead - QuartermasterBeret +#Sunrise-start + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandBrown + - Sunrise-BandPurple + - StationEngineerHardhatOrange + - StationEngineerHardhatYellow + - Sunrise-HardhatYellowDark + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + - Sunrise-HatBrownsoft + - Sunrise-BrownFlatcap + - Sunrise-FedoraBrown + - Sunrise-CatBrown + - Sunrise-HelmetCosmonaut +#Sunrise-end - type: loadoutGroup id: QuartermasterJumpsuit @@ -615,6 +631,13 @@ loadouts: - QuartermasterCloak - QuartermasterMantle +#Sunrise-start + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfBrown + - Sunrise-ScarfPurple + - Sunrise-BedsheetCosmos +#Sunrise-end - type: loadoutGroup id: QuartermasterOuterClothing @@ -622,6 +645,17 @@ minLimit: 0 loadouts: - QuartermasterWintercoat +#Sunrise-start + - SalvageSpecialistWintercoat + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow + - Sunrise-WinterColorBrown + - Sunrise-WinterColorLightBrown + - Sunrise-WinterColorPurple + - Sunrise-PonchoClassic + - Sunrise-CoatBomber + - Sunrise-CoatTrench +#Sunrise-end - type: loadoutGroup id: QuartermasterShoes @@ -629,6 +663,13 @@ loadouts: - BrownShoes - CargoWinterBoots +#Sunrise-start + - BlackShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes + - Sunrise-ShoesPurple + - Sunrise-ShoesLeather +#Sunrise-end - type: loadoutGroup id: CargoTechnicianHead @@ -636,6 +677,18 @@ minLimit: 0 loadouts: - CargoTechnicianHead +#Sunrise-start + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandBrown + - Sunrise-BandPurple + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + - Sunrise-HatBrownsoft + - Sunrise-BrownFlatcap + - Sunrise-CatBrown + - Sunrise-HelmetCosmonaut +#Sunrise-end - type: loadoutGroup id: CargoTechnicianJumpsuit @@ -658,6 +711,14 @@ minLimit: 0 loadouts: - CargoTechnicianWintercoat +#Sunrise-start + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow + - Sunrise-WinterColorBrown + - Sunrise-WinterColorLightBrown + - Sunrise-PonchoClassic + - Sunrise-CoatBomber +#Sunrise-end - type: loadoutGroup id: CargoTechnicianShoes @@ -665,6 +726,11 @@ loadouts: - BlackShoes - CargoWinterBoots +#Sunrise-start + - Sunrise-OrangeShoes + - Sunrise-YellowShoes + - BrownShoes +#Sunrise-end - type: loadoutGroup id: SalvageSpecialistBackpack @@ -680,6 +746,15 @@ minLimit: 0 loadouts: - SalvageSpecialistWintercoat +#Sunrise-start + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow + - Sunrise-WinterColorBrown + - Sunrise-WinterColorLightBrown + - Sunrise-WinterColorPurple + - Sunrise-PonchoClassic + - Sunrise-CoatBomber +#Sunrise-end - type: loadoutGroup id: SalvageSpecialistShoes @@ -687,6 +762,13 @@ loadouts: - SalvageBoots - CargoWinterBoots +#Sunrise-start + - BlackShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes + - BrownShoes + - Sunrise-ShoesPurple +#Sunrise-end # Engineering - type: loadoutGroup @@ -705,6 +787,14 @@ loadouts: - ChiefEngineerCloak - ChiefEngineerMantle + #sunrise-start + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfCyan + - Sunrise-ScarfLightBlue + - Sunrise-TieRed + #Sunrise-end - type: loadoutGroup id: ChiefEngineerOuterClothing @@ -712,6 +802,16 @@ minLimit: 0 loadouts: - ChiefEngineerWintercoat + #Sunrise-start + - Sunrise-WinterColorrColorWhite + - Sunrise-ClothingOuterFlannelWhite + - StationEngineerOuterVest + - StationEngineerWintercoat + - AtmosphericTechnicianWintercoat + - Sunrise-WinterColorrColorRed + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow + #Sunrise-end - type: loadoutGroup id: ChiefEngineerShoes @@ -719,7 +819,12 @@ loadouts: - BrownShoes - EngineeringWinterBoots - +#sunrise-start + - WhiteShoes + - Sunrise-RedShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes +#Sunrise-end - type: loadoutGroup id: TechnicalAssistantJumpsuit name: loadout-group-technical-assistant-jumpsuit @@ -731,9 +836,22 @@ id: StationEngineerHead name: loadout-group-station-engineer-head loadouts: +#sunrise-start + - Sunrise-EngineerHeadBeret + - Sunrise-BandRed + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-HardhatYellowDark + - Sunrise-BandWhite +#Sunrise-end - StationEngineerHardhatYellow - StationEngineerHardhatOrange - StationEngineerHardhatRed +#sunrise-start + - Sunrise-HatRedsoft + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft +#Sunrise-end - type: loadoutGroup id: StationEngineerJumpsuit @@ -758,13 +876,22 @@ loadouts: - StationEngineerOuterVest - StationEngineerWintercoat - +#sunrise-start + - Sunrise-WinterColorrColorRed + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow +#sunrise-end - type: loadoutGroup id: StationEngineerShoes name: loadout-group-station-engineer-shoes loadouts: - WorkBoots - EngineeringWinterBoots +#sunrise-start + - Sunrise-RedShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes +#sunrise-end - type: loadoutGroup id: AtmosphericTechnicianJumpsuit @@ -780,6 +907,12 @@ minLimit: 0 loadouts: - AtmosphericTechnicianWintercoat +#sunrise-start + - StationEngineerOuterVest + - Sunrise-WinterColorrColorRed + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow +#sunrise-end - type: loadoutGroup id: AtmosphericTechnicianBackpack @@ -795,6 +928,11 @@ loadouts: - WhiteShoes - EngineeringWinterBoots +#sunrise-start + - Sunrise-RedShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes +#sunrise-end - type: loadoutGroup id: SurvivalExtended diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 19fc86af655..d73841827b6 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -268,12 +268,21 @@ - GroupTankHarness - QuartermasterHead - QuartermasterNeck + # Sunrise-start + - SunriseQuartermasterMask + # Sunrise-end - QuartermasterJumpsuit - CargoTechnicianBackpack - QuartermasterOuterClothing + # Sunrise-start + - SunriseQuartermasterGloves + # Sunrise-end - QuartermasterShoes - Glasses - Survival + # Sunrise-start + - TrinketsCargo + # Sunrise-end - Trinkets - GroupSpeciesBreathTool # Sunrise-start @@ -287,10 +296,20 @@ groups: - GroupTankHarness - CargoTechnicianHead + # Sunrise-start + - SunriseCargoTechNeck + - SunriseCargoTechMask + # Sunrise-end - CargoTechnicianJumpsuit - CargoTechnicianBackpack - CargoTechnicianOuterClothing + # Sunrise-start + - SunriseCargoTechGloves + # Sunrise-end - CargoTechnicianShoes + # Sunrise-start + - TrinketsCargo + # Sunrise-end - Glasses - Survival - Trinkets @@ -305,9 +324,20 @@ id: JobSalvageSpecialist groups: - GroupTankHarness + # Sunrise-start + - SunriseSalvageHead + - SunriseSalvageNeck + - SunriseSalvageMask + # Sunrise-end - SalvageSpecialistBackpack - SalvageSpecialistOuterClothing + # Sunrise-start + - SunriseSalvageGloves + # Sunrise-end - SalvageSpecialistShoes + # Sunrise-start + - TrinketsCargo + # Sunrise-end - Glasses - Survival - Trinkets @@ -327,13 +357,19 @@ - ChiefEngineerJumpsuit - ChiefEngineerBackpack # Sunrise-Edit - ChiefEngineerNeck + # Sunrise-start + - SunriseCEMask + # Sunrise-end - ChiefEngineerOuterClothing + # Sunrise-start + - SunriseCEGloves + # Sunrise-end - ChiefEngineerShoes - SurvivalExtended - Trinkets - GroupSpeciesBreathTool # Sunrise-start - - AtmosphericsConsole + - TrinketsEngineering - Bra - Pants - Socks @@ -343,12 +379,22 @@ id: JobTechnicalAssistant groups: - GroupTankHarness + # Sunrise-start + - StationEngineerHead + # Sunrise-end - TechnicalAssistantJumpsuit - StationEngineerBackpack + # Sunrise-start + - StationSunriseEngineerNeck + - StationSunriseEngineerMask + - StationEngineerOuterClothing + # Sunrise-end - SurvivalExtended - Trinkets - GroupSpeciesBreathTool # Sunrise-start + - StationSunriseEngineerGloves + - TrinketsEngineering - Bra - Pants - Socks @@ -361,6 +407,10 @@ - StationEngineerHead - StationEngineerJumpsuit - StationEngineerBackpack + # Sunrise-start + - StationSunriseEngineerNeck + - StationSunriseEngineerMask + # Sunrise-end - StationEngineerOuterClothing - StationEngineerShoes #- StationEngineerID @@ -368,7 +418,8 @@ - Trinkets - GroupSpeciesBreathTool # Sunrise-start - - AtmosphericsConsole + - StationSunriseEngineerGloves + - TrinketsEngineering - Bra - Pants - Socks @@ -379,14 +430,25 @@ groups: - GroupTankHarness - AtmosphericTechnicianJumpsuit + # Sunrise-start + - SunriseAtmosHead + # Sunrise-end - AtmosphericTechnicianBackpack + # Sunrise-start + - SunriseAtmosNeck + - SunriseAtmosMask + # Sunrise-end - AtmosphericTechnicianOuterClothing + # Sunrise-start + - SunriseAtmosGloves + # Sunrise-end - AtmosphericTechnicianShoes - SurvivalExtended - Trinkets - GroupSpeciesBreathTool # Sunrise-start - - AtmosphericsConsole + - StationSunriseEngineerGloves + - TrinketsEngineering - Bra - Pants - Socks diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 31ba214aa08..7752a8d51b6 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -44,7 +44,7 @@ equipment: id: QuartermasterPDA ears: ClothingHeadsetQM - belt: BoxFolderClipboard +# belt: BoxFolderClipboard # Sunrise-Edit pocket1: AppraisalTool storage: back: diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 27f5b0621eb..7e706c47e9f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -42,7 +42,7 @@ id: ChiefEngineerGear equipment: id: CEPDA - head: ClothingHeadHatHardhatWhite # Sunrise-Edit +# head: ClothingHeadHatHardhatWhite # Sunrise-Edit eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetCE belt: ClothingBeltUtilityEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index fb48a768c32..3582f5fd6c4 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -49,8 +49,8 @@ id: HoSPDA gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity - pocket1: WeaponPistolG22NonLethal # Sunrise-Edit +# pocket1: WeaponPistolG22NonLethal # Sunrise-Edit storage: back: - Flash - - MagazineGlock22Rubber # Sunrise-Edit +# - MagazineGlock22Rubber # Sunrise-Edit diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index f4992419a7d..6d56c47094f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -33,8 +33,8 @@ ears: ClothingHeadsetSecurity head: ClothingHeadHelmetBasic gloves: ClothingHandsGlovesColorBlack - pocket1: WeaponPistolG22NonLethal # Sunrise-Edit +# pocket1: WeaponPistolG22NonLethal # Sunrise-Edit storage: back: - Flash - - MagazineGlock22Rubber +# - MagazineGlock22Rubber # Sunrise-Edit diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 5fbf9aa111f..2517f4f5d74 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -33,8 +33,8 @@ eyes: ClothingEyesGlassesSecurity id: WardenPDA ears: ClothingHeadsetSecurity - pocket1: WeaponPistolG22NonLethal # Sunrise-Edit +# pocket1: WeaponPistolG22NonLethal # Sunrise-Edit storage: back: - Flash - - MagazineGlock22Rubber # Sunrise-Edit +# - MagazineGlock22Rubber # Sunrise-Edit diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/bandanas.yml new file mode 100644 index 00000000000..7dacd8b26bb --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/bandanas.yml @@ -0,0 +1,24 @@ +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandOrange] + id: ClothingHeadBandOrange + name: orange bandana + +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandYellow] + id: ClothingHeadBandYellow + name: yellow bandana + +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandCyan] + id: ClothingHeadBandCyan + name: cyan bandana + +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandWhite] + id: ClothingHeadBandWhite + name: white bandana + +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandPurple] + id: ClothingHeadBandPurple + name: purple bandana \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/soft.yml new file mode 100644 index 00000000000..291724a6a64 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/soft.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingHeadHeadHatBaseFlippable + id: ClothingHeadHatBrownsoft + name: brown cap + description: "It's a baseball hat in a tasteless brown colour." + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Soft/brownsoft.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Soft/brownsoft.rsi + +- type: entity + parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBrownsoft] + id: ClothingHeadHatBrownsoftFlipped + name: brown cap diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/bandanas.yml new file mode 100644 index 00000000000..24db72eebb4 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/bandanas.yml @@ -0,0 +1,54 @@ +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandOrange + name: orange bandana + description: A orange bandana to make you look cool. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Bandanas/orange.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Bandanas/orange.rsi + +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandYellow + name: yellow bandana + description: A yellow bandana to make you look cool. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Bandanas/yellow.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Bandanas/yellow.rsi + +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandCyan + name: cyan bandana + description: cyan bandana to make you look cool. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Bandanas/cyan.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Bandanas/cyan.rsi + +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandWhite + name: white bandana + description: white bandana to make you look cool. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Bandanas/white.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Bandanas/white.rsi + +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandPurple + name: purple bandana + description: purple bandana to make you look cool. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Bandanas/purple.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Bandanas/purple.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/scarfs.yml new file mode 100644 index 00000000000..9af408ec570 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/scarfs.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingScarfBase + id: ClothingNeckScarfStripedYellow + name: striped yellow scarf + description: A stylish striped yellow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Neck/Scarfs/yellow.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Neck/Scarfs/yellow.rsi + +- type: entity + parent: ClothingScarfBase + id: ClothingNeckScarfStripedCyan + name: striped cyan scarf + description: A stylish striped cyan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Neck/Scarfs/cyan.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Neck/Scarfs/cyan.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/misc.yml new file mode 100644 index 00000000000..6580f9d0ebb --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/misc.yml @@ -0,0 +1,35 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterFlannelWhite + name: red flannel jacket + description: An old fashioned white flannel jacket for space autumn. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + layers: + - state: icon + color: "#eaf1ff" + - state: icon-lines + color: "#000000" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#eaf1ff" + - state: inhand-left-lines + color: "#000000" + right: + - state: inhand-right + color: "#eaf1ff" + - state: inhand-right-lines + color: "#000000" + - type: Clothing + sprite: Clothing/OuterClothing/Misc/flannel_jacket.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + color: "#eaf1ff" + - state: equipped-OUTERCLOTHING-lines + color: "#000000" + - type: TemperatureProtection + coolingCoefficient: 0.3 diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/animals.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/animals.yml index 1508c6ccb61..3e0c21af013 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/animals.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/animals.yml @@ -115,6 +115,8 @@ - ClothingHeadBandBlue - ClothingHeadBandGold - ClothingHeadBandGreen + - ClothingHeadBandYellow + - ClothingHeadBandOrange - ClothingHeadBandGrey - ClothingHeadBandRed - ClothingHeadBandSkull diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml index 06aed15d2e1..338c31ccfce 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml @@ -802,3 +802,44 @@ - type: Sprite state: raisya sprite: _Sunrise/Objects/Fun/toys.rsi + +- type: entity + id: GoldenWeh + abstract: true + components: + - type: MeleeWeapon + soundHit: + path: /Audio/_Sunrise/bye.ogg + params: + volume: 100 + - type: EmitSoundOnTrigger + sound: + collection: GWA + - type: EmitSoundOnCollide + sound: + path: /Audio/_Sunrise/Tovarish.ogg + - type: EmitSoundOnUse + sound: + collection: GWA + - type: EmitSoundOnLand + sound: + path: /Audio/_Sunrise/Tovarish.ogg + - type: UseDelay + delay: 2.0 + - type: EmitSoundOnActivate + sound: + path: /Audio/_Sunrise/not_for_long_weh.ogg + params: + maxDistance: 10 + +- type: entity + parent: + - GoldenWeh + - BasePlushie + id: LegendaryGoldenWeh + name: Legendary golden Weh + description: Do you remember how you made your way through the dangers, how you left a fake instead, accidentally activated a trap and started running away from a huge ball! But wait, it was a dream, then where did you get it? + components: + - type: Sprite + state: legendary-golden-weh + sprite: _Sunrise/Objects/Fun/toys.rsi diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/cargo.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/cargo.yml new file mode 100644 index 00000000000..fd73c0f9c35 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/cargo.yml @@ -0,0 +1,133 @@ + #Back + +- type: loadout + id: TrinketsCargoGPS + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 7200 # 2hr + storage: + back: + - HandheldGPSBasic + +- type: loadout + id: TrinketsCargoFL + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 7200 # 2hr + storage: + back: + - FlashlightLantern + +- type: loadout + id: TrinketsCargoF + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 7200 # 2hr + storage: + back: + - Flare + +- type: loadout + id: TrinketsCargoLB + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 7200 # 2hr + storage: + back: + - HandLabeler + +- type: loadout + id: TrinketsCargoRH + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 36000 # 10hr + storage: + back: + - RadioHandheld + +- type: loadout + id: TrinketsCargoT + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCargoTechnician + time: 72000 # 20hr + storage: + back: + - ToyFigurineCargoTech + +- type: loadout + id: TrinketsCargoS + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 72000 # 20hr + storage: + back: + - ToyFigurineSalvage + +- type: loadout + id: TrinketsCargoQ + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobQuartermaster + time: 72000 # 20hr + storage: + back: + - ToyFigurineQuartermaster + +- type: loadout + id: TrinketsCargoSD + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 108000 # 30hr + storage: + back: + - ToyFigurineSpaceDragon + +- type: loadout + id: TrinketsCargoQueen + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 180000 # 50hr + storage: + back: + - ToyFigurineQueen + +- type: loadout + id: TrinketsCargoLGW + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 1080000 # 300hr + storage: + back: + - LegendaryGoldenWeh \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/engineering.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/engineering.yml index c82fe3eb15c..46cb4be3394 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/engineering.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/engineering.yml @@ -1,5 +1,188 @@ -- type: loadout - id: AtmosphericsConsole + #Back + +- type: loadout + id: TrinketsEngineeringAAM + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 7200 # 2hr storage: back: - AtmosAlertsMonitor + +- type: loadout + id: TrinketsEngineeringTS + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 7200 # 2hr + storage: + back: + - trayScanner + +- type: loadout + id: TrinketsEngineeringFL + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 7200 # 2hr + storage: + back: + - FlashlightLantern + +- type: loadout + id: TrinketsEngineeringGA + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 7200 # 2hr + storage: + back: + - GasAnalyzer + +- type: loadout + id: TrinketsEngineeringGC + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 7200 # 2hr + storage: + back: + - GeigerCounter + +- type: loadout + id: TrinketsEngineeringTT + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 1080000 # 300hr + storage: + back: + - TeslaToy + +- type: loadout + id: TrinketsEngineeringTFCF + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChiefEngineer + time: 72000 # 20 hour + storage: + back: + - ToyFigurineChiefEngineer + + +- type: loadout + id: TrinketsEngineeringTFAT + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobAtmosphericTechnician + time: 72000 # 20 hour + storage: + back: + - ToyFigurineAtmosTech + +- type: loadout + id: TrinketsEngineeringTFE + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobStationEngineer + time: 72000 # 20 hour + storage: + back: + - ToyFigurineEngineer + +- type: loadout + id: TrinketsEngineeringST + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 1080000 # 300hr + storage: + back: + - SingularityToy + +- type: loadout + id: TrinketsEngineeringHSM + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 36000 # 10hr + storage: + back: + - HandheldStationMap + + #Neck + + + + + #Mask + +- type: loadout + id: EngineerMaskCMG + equipment: + mask: ClothingMaskGas + +- type: loadout + id: EngineerMaskCMGA + equipment: + mask: ClothingMaskGasAtmos + + + + #Head + +- type: loadout + id: Sunrise-EngineerHeadBeret + equipment: + head: ClothingHeadHatBeretEngineering + + + +- type: loadout + id: Sunrise-HardhatYellowDark + equipment: + head: ClothingHeadHatHardhatYellowDark + +- type: loadout + id: Sunrise-HardhatBlue + equipment: + head: ClothingHeadHatHardhatBlue + +- type: loadout + id: Sunrise-HardhatWhite + equipment: + head: ClothingHeadHatHardhatWhite + +- type: loadout + id: Sunrise-HardhatArmored + equipment: + head: ClothingHeadHatHardhatArmored + + + + + + diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml new file mode 100644 index 00000000000..fd3762fd6c8 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/general_clothing.yml @@ -0,0 +1,313 @@ + +#Head + +- type: loadout + id: Sunrise-BandRed + equipment: + head: ClothingHeadBandRed + +- type: loadout + id: Sunrise-BandWhite + equipment: + head: ClothingHeadBandWhite + +- type: loadout + id: Sunrise-BandOrange + equipment: + head: ClothingHeadBandOrange + +- type: loadout + id: Sunrise-BandYellow + equipment: + head: ClothingHeadBandYellow + +- type: loadout + id: Sunrise-BandCyan + equipment: + head: ClothingHeadBandCyan + +- type: loadout + id: Sunrise-HatRedsoft + equipment: + head: ClothingHeadHatRedsoft + +- type: loadout + id: Sunrise-HatOrangesoft + equipment: + head: ClothingHeadHatOrangesoft + +- type: loadout + id: Sunrise-HatYellowsoft + equipment: + head: ClothingHeadHatYellowsoft + +- type: loadout + id: Sunrise-HatBluesoft + equipment: + head: ClothingHeadHatBluesoft + +- type: loadout + id: Sunrise-BandPurple + equipment: + head: ClothingHeadBandPurple + +- type: loadout + id: Sunrise-HatBrownsoft + equipment: + head: ClothingHeadHatBrownsoft + +- type: loadout + id: Sunrise-BrownFlatcap + equipment: + head: ClothingHeadHatBrownFlatcap + +- type: loadout + id: Sunrise-FedoraBrown + equipment: + head: ClothingHeadHatFedoraBrown + +- type: loadout + id: Sunrise-CowboyBrown + equipment: + head: ClothingHeadHatCowboyBrown + +- type: loadout + id: Sunrise-BandBrown + equipment: + head: ClothingHeadBandBrown + +- type: loadout + id: Sunrise-HelmetCosmonaut + equipment: + head: ClothingHeadHelmetCosmonaut + +- type: loadout + id: Sunrise-CatBrown + equipment: + head: ClothingHeadHatAnimalCatBrown + +#Mask + + +- type: loadout + id: Sunrise-MBandWhite + equipment: + mask: ClothingMaskBandWhite + +- type: loadout + id: Sunrise-MBandRed + equipment: + mask: ClothingMaskBandRed + +- type: loadout + id: Sunrise-MBandOrange + equipment: + mask: ClothingMaskBandOrange + +- type: loadout + id: Sunrise-MBandYellow + equipment: + mask: ClothingMaskBandYellow + +- type: loadout + id: Sunrise-MBandCyan + equipment: + mask: ClothingMaskBandCyan + +- type: loadout + id: Sunrise-MBandPurple + equipment: + mask: ClothingMaskBandPurple + +- type: loadout + id: Sunrise-MaskGasExplorer + equipment: + mask: ClothingMaskGasExplorer + +- type: loadout + id: Sunrise-MBandBrown + equipment: + mask: ClothingMaskBandBrown + +#Neck + +- type: loadout + id: Sunrise-ScarfRed + equipment: + neck: ClothingNeckScarfStripedRed + +- type: loadout + id: Sunrise-ScarfOrange + equipment: + neck: ClothingNeckScarfStripedOrange + +- type: loadout + id: Sunrise-ScarfBlue + equipment: + neck: ClothingNeckScarfStripedBlue + +- type: loadout + id: Sunrise-ScarfYellow + equipment: + neck: ClothingNeckScarfStripedYellow + +- type: loadout + id: Sunrise-ScarfCyan + equipment: + neck: ClothingNeckScarfStripedCyan + +- type: loadout + id: Sunrise-ScarfLightBlue + equipment: + neck: ClothingNeckScarfStripedLightBlue + +- type: loadout + id: Sunrise-TieRed + equipment: + neck: ClothingNeckTieRed + +- type: loadout + id: Sunrise-BedsheetCosmos + equipment: + neck: BedsheetCosmos + + +- type: loadout + id: Sunrise-ScarfBrown + equipment: + neck: ClothingNeckScarfStripedBrown + + +- type: loadout + id: Sunrise-ScarfPurple + equipment: + neck: ClothingNeckScarfStripedPurple + +#ClothingOuter + +- type: loadout + id: Sunrise-WinterColorYellow + equipment: + outerClothing: ClothingOuterWinterColorYellow + +- type: loadout + id: Sunrise-WinterColorOrange + equipment: + outerClothing: ClothingOuterWinterColorOrange + +- type: loadout + id: Sunrise-WinterColorrColorRed + equipment: + outerClothing: ClothingOuterWinterColorRed + +- type: loadout + id: Sunrise-WinterColorrColorWhite + equipment: + outerClothing: ClothingOuterWinterColorWhite + +- type: loadout + id: Sunrise-ClothingOuterFlannelWhite + equipment: + outerClothing: ClothingOuterFlannelWhite + +- type: loadout + id: Sunrise-WinterColorBrown + equipment: + outerClothing: ClothingOuterWinterColorBrown + +- type: loadout + id: Sunrise-WinterColorPurple + equipment: + outerClothing: ClothingOuterWinterColorPurple + +- type: loadout + id: Sunrise-PonchoClassic + equipment: + outerClothing: ClothingOuterPonchoClassic + +- type: loadout + id: Sunrise-WinterColorLightBrown + equipment: + outerClothing: ClothingOuterWinterColorLightBrown + +- type: loadout + id: Sunrise-CoatBomber + equipment: + outerClothing: ClothingOuterCoatBomber + +- type: loadout + id: Sunrise-CoatTrench + equipment: + outerClothing: ClothingOuterCoatTrench + +#Shoes + +- type: loadout + id: Sunrise-YellowShoes + equipment: + shoes: ClothingShoesColorYellow + +- type: loadout + id: Sunrise-RedShoes + equipment: + shoes: ClothingShoesColorRed + +- type: loadout + id: Sunrise-OrangeShoes + equipment: + shoes: ClothingShoesColorOrange + +- type: loadout + id: Sunrise-ShoesPurple + equipment: + shoes: ClothingShoesColorPurple + +- type: loadout + id: Sunrise-ShoesCowboyBrown + equipment: + shoes: ClothingShoesBootsCowboyBrown + +- type: loadout + id: Sunrise-ShoesLeather + equipment: + shoes: ClothingShoesLeather + +#gloves + +- type: loadout + id: Sunrise-RedGloves + equipment: + gloves: ClothingHandsGlovesColorRed + +- type: loadout + id: Sunrise-TealGloves + equipment: + gloves: ClothingHandsGlovesColorTeal + +- type: loadout + id: Sunrise-YellowBudgetGloves + equipment: + gloves: ClothingHandsGlovesColorYellowBudget + +- type: loadout + id: Sunrise-WhiteGloves + equipment: + gloves: ClothingHandsGlovesColorWhite + +- type: loadout + id: Sunrise-BrownGloves + equipment: + gloves: ClothingHandsGlovesColorBrown + +- type: loadout + id: Sunrise-LightBrownGloves + equipment: + gloves: ClothingHandsGlovesColorLightBrown + +#Back + +- type: loadout + id: Sunrise-Clipboard + storage: + back: + - BoxFolderClipboard diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index 0556a6f8fc1..309c10c952e 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -176,15 +176,6 @@ - HeadHatBeretCentcomNaval - HeadHatCentcomcap -- type: loadoutGroup - id: ChiefEngineerHead - name: loadout-group-chief-engineer-head - minLimit: 0 - loadouts: - - ChiefEngineerHead - - ChiefEngineerBeret - - ChiefEngineerCrown - - type: loadoutGroup id: ChiefEngineerBackpack name: loadout-group-chief-engineer-backpack @@ -318,8 +309,392 @@ loadouts: - AdjutantCoat +#Engineer + +- type: loadoutGroup + id: TrinketsEngineering + name: loadout-group-engineering-trinkets + minLimit: 0 + maxLimit: 2 + loadouts: + - TrinketsEngineeringAAM + - TrinketsEngineeringTS + - TrinketsEngineeringFL + - TrinketsEngineeringGA + - TrinketsEngineeringGC + - TrinketsEngineeringHSM + - TrinketsEngineeringTFE + - TrinketsEngineeringTFAT + - TrinketsEngineeringTFCF +# - TrinketsEngineeringTT + - TrinketsEngineeringST + +- type: loadoutGroup + id: SeniorEngineerNeck + name: loadout-group-senior-engineering-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfCyan + - Sunrise-ScarfLightBlue + - Sunrise-TieRed + - type: loadoutGroup - id: AtmosphericsConsole - name: loadout-group-atmos-console + id: SeniorEngineerMask + name: loadout-group-senior-engineering-mask + minLimit: 0 + maxLimit: 1 loadouts: - - AtmosphericsConsole + - EngineerMaskCMG + - EngineerMaskCMGA + - Sunrise-MBandRed + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandCyan + +- type: loadoutGroup + id: SeniorEngineerHead + name: loadout-group-senior-engineering-head + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-EngineerHeadBeret + - Sunrise-BandRed + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandCyan + - StationEngineerHardhatRed + - StationEngineerHardhatOrange + - StationEngineerHardhatYellow + - Sunrise-HardhatYellowDark + - Sunrise-HardhatBlue + - Sunrise-HatRedsoft + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + +- type: loadoutGroup + id: SeniorEngineerShoes + name: loadout-group-senior-engineering-shoes + minLimit: 1 + maxLimit: 1 + loadouts: + - BrownShoes + - WorkBoots + - EngineeringWinterBoots + - Sunrise-RedShoes + - Sunrise-OrangeShoes + - Sunrise-YellowShoes + - WhiteShoes + +- type: loadoutGroup + id: SeniorEngineerOuterClothing + name: loadout-group-senior-engineering-outer-clothing + minLimit: 0 + maxLimit: 1 + loadouts: + - StationEngineerOuterVest + - StationEngineerWintercoat + - AtmosphericTechnicianWintercoat + - Sunrise-WinterColorrColorRed + - Sunrise-WinterColorOrange + - Sunrise-WinterColorYellow + +- type: loadoutGroup + id: StationSeniorEngineerBackpack + name: loadout-group-senior-engineering-backpack + minLimit: 1 + maxLimit: 1 + loadouts: + - StationEngineerBackpack + - StationEngineerSatchel + - StationEngineerDuffel + - AtmosphericTechnicianBackpack + - AtmosphericTechnicianSatchel + - AtmosphericTechnicianDuffel + +- type: loadoutGroup + id: SeniorEngineerGloves + name: loadout-group-senior-engineering-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - PassengerGloves + - Sunrise-YellowBudgetGloves + - Sunrise-RedGloves + - OrangeGloves + - Sunrise-TealGloves + - Sunrise-WhiteGloves + +- type: loadoutGroup + id: StationSunriseEngineerGloves + name: loadout-group-station-engineer-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - PassengerGloves + - Sunrise-YellowBudgetGloves + - Sunrise-RedGloves + - OrangeGloves + +- type: loadoutGroup + id: StationSunriseEngineerMask + name: loadout-group-station-engineer-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-MBandRed + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - EngineerMaskCMG + +- type: loadoutGroup + id: StationSunriseEngineerNeck + name: loadout-group-station-engineer-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-TieRed + +- type: loadoutGroup + id: SunriseAtmosGloves + name: loadout-group-atmospheric-technician-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - PassengerGloves + - Sunrise-YellowBudgetGloves + - Sunrise-RedGloves + - OrangeGloves + - Sunrise-TealGloves + - Sunrise-WhiteGloves + +- type: loadoutGroup + id: SunriseAtmosHead + name: loadout-group-atmospheric-technician-head + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-EngineerHeadBeret + - Sunrise-BandRed + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandCyan + - StationEngineerHardhatRed + - StationEngineerHardhatOrange + - StationEngineerHardhatYellow + - Sunrise-HardhatYellowDark + - Sunrise-HardhatBlue + - Sunrise-HatRedsoft + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + +- type: loadoutGroup + id: SunriseAtmosMask + name: loadout-group-atmospheric-technician-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - EngineerMaskCMG + - EngineerMaskCMGA + - Sunrise-MBandRed + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandCyan + +- type: loadoutGroup + id: SunriseAtmosNeck + name: loadout-group-atmospheric-technician-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-ScarfRed + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfCyan + - Sunrise-ScarfLightBlue + - Sunrise-TieRed + +- type: loadoutGroup + id: SunriseCEGloves + name: loadout-group-chief-engineer-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - PassengerGloves + - Sunrise-YellowBudgetGloves + - Sunrise-RedGloves + - OrangeGloves + - Sunrise-TealGloves + - Sunrise-WhiteGloves + +- type: loadoutGroup + id: SunriseCEMask + name: loadout-group-chief-engineer-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - EngineerMaskCMG + - EngineerMaskCMGA + - Sunrise-MBandRed + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandCyan + - Sunrise-MBandWhite + +- type: loadoutGroup + id: ChiefEngineerHead + name: loadout-group-chief-engineer-head + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-HardhatWhite + - Sunrise-BandWhite + - Sunrise-EngineerHeadBeret + - Sunrise-BandRed + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandCyan + - StationEngineerHardhatRed + - StationEngineerHardhatOrange + - StationEngineerHardhatYellow + - Sunrise-HardhatYellowDark + - Sunrise-HardhatBlue + - Sunrise-HatRedsoft + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + - ChiefEngineerCrown + +#Cargo + +- type: loadoutGroup + id: SunriseQuartermasterGloves + name: loadout-group-quartermaster-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - OrangeGloves + - Sunrise-LightBrownGloves + - Sunrise-BrownGloves + - PurpleGloves + +- type: loadoutGroup + id: SunriseCargoTechGloves + name: loadout-group-cargo-technician-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - OrangeGloves + - Sunrise-LightBrownGloves + - Sunrise-BrownGloves + +- type: loadoutGroup + id: SunriseSalvageGloves + name: loadout-group-salvage-specialist-gloves + minLimit: 0 + maxLimit: 1 + loadouts: + - OrangeGloves + - Sunrise-LightBrownGloves + - Sunrise-BrownGloves + - PurpleGloves + +- type: loadoutGroup + id: SunriseQuartermasterMask + name: loadout-group-quartermaster-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-MaskGasExplorer + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandBrown + - Sunrise-MBandPurple + +- type: loadoutGroup + id: SunriseCargoTechMask + name: loadout-group-cargo-technician-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandBrown + +- type: loadoutGroup + id: SunriseSalvageMask + name: loadout-group-salvage-specialist-mask + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-MaskGasExplorer + - Sunrise-MBandOrange + - Sunrise-MBandYellow + - Sunrise-MBandBrown + - Sunrise-MBandPurple + +- type: loadoutGroup + id: SunriseCargoTechNeck + name: loadout-group-cargo-technician-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfBrown + +- type: loadoutGroup + id: SunriseSalvageNeck + name: loadout-group-salvage-specialist-neck + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-ScarfOrange + - Sunrise-ScarfYellow + - Sunrise-ScarfBrown + - Sunrise-ScarfPurple + - Sunrise-BedsheetCosmos + +- type: loadoutGroup + id: SunriseSalvageHead + name: loadout-group-salvage-specialist-head + minLimit: 0 + maxLimit: 1 + loadouts: + - Sunrise-BandOrange + - Sunrise-BandYellow + - Sunrise-BandBrown + - Sunrise-BandPurple + - StationEngineerHardhatOrange + - StationEngineerHardhatYellow + - Sunrise-HardhatYellowDark + - Sunrise-HatOrangesoft + - Sunrise-HatYellowsoft + - Sunrise-HatBrownsoft + - Sunrise-BrownFlatcap + - Sunrise-CatBrown + - Sunrise-HelmetCosmonaut + +- type: loadoutGroup + id: TrinketsCargo + name: loadout-group-cargo-trinkets + minLimit: 0 + maxLimit: 2 + loadouts: + - Sunrise-Clipboard + - TrinketsCargoGPS + - TrinketsCargoFL + - TrinketsCargoF + - TrinketsCargoLB + - TrinketsCargoRH + - TrinketsCargoT + - TrinketsCargoS + - TrinketsCargoSD + - TrinketsCargoQueen + - TrinketsCargoQ + - TrinketsCargoLGW diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 4c693622822..50cff4f12f2 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -123,10 +123,14 @@ id: JobSeniorEngineer groups: - SeniorEngineerJumpsuit - - StationEngineerBackpack - - StationEngineerOuterClothing - - StationEngineerShoes - - AtmosphericsConsole + - SeniorEngineerHead + - StationSeniorEngineerBackpack + - SeniorEngineerNeck + - SeniorEngineerMask + - SeniorEngineerOuterClothing + - SeniorEngineerGloves + - SeniorEngineerShoes + - TrinketsEngineering - SurvivalExtended - Trinkets - GroupSpeciesBreathTool @@ -156,9 +160,11 @@ - StationEngineerHead - StationEngineerJumpsuit - StationEngineerBackpack + - SeniorEngineerNeck + - SeniorEngineerMask - StationEngineerOuterClothing - StationEngineerShoes - - AtmosphericsConsole + - TrinketsEngineering - Trinkets - SurvivalExtended - GroupSpeciesBreathTool @@ -336,3 +342,4 @@ - Bra - Pants - Socks + diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/clothing.yml index ca2bef5a524..8cc1ab2cd35 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/clothing.yml @@ -28,3 +28,13 @@ parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtAdjutant result: ClothingUniformJumpskirtAdjutant + +- type: latheRecipe + parent: BaseNeckClothingRecipe + id: ClothingNeckScarfStripedYellow + result: ClothingNeckScarfStripedYellow + +- type: latheRecipe + parent: BaseNeckClothingRecipe + id: ClothingNeckScarfStripedCyan + result: ClothingNeckScarfStripedCyan \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml index 1fdf28674a9..0538709c7b6 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Engineering/senior_engineer.yml @@ -27,7 +27,6 @@ - type: startingGear id: SeniorEngineerGear equipment: - head: ClothingHeadHatBeretEngineering id: SeniorEngineerPDA eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/goldenweh.yml b/Resources/Prototypes/_Sunrise/SoundCollections/goldenweh.yml new file mode 100644 index 00000000000..681e0065b72 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/SoundCollections/goldenweh.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: GWA + files: + - /Audio/_Sunrise/GW/goldenweh1.ogg + - /Audio/_Sunrise/GW/goldenweh2.ogg + - /Audio/_Sunrise/GW/goldenweh3.ogg + - /Audio/_Sunrise/GW/goldenweh4.ogg + - /Audio/_Sunrise/GW/goldenweh5.ogg diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..ba952f6bcc0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..29721178cff Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..50497ea3829 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..3e2c6bd1141 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK.png new file mode 100644 index 00000000000..c74ce0dbf32 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon.png new file mode 100644 index 00000000000..e2079098365 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon_mask.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon_mask.png new file mode 100644 index 00000000000..454a281b75b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/icon_mask.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-left.png new file mode 100644 index 00000000000..78bf67d7ab8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-right.png new file mode 100644 index 00000000000..199edf97d56 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/meta.json new file mode 100644 index 00000000000..7f1a6150971 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/cyan.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..1d5047fbf61 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..ac5a033caeb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d7330047788 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..13bae73cc73 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK.png new file mode 100644 index 00000000000..f697167eddf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon.png new file mode 100644 index 00000000000..bdae6b0a4ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon_mask.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon_mask.png new file mode 100644 index 00000000000..e60bbbfea48 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/icon_mask.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-left.png new file mode 100644 index 00000000000..3486c68f0ac Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-right.png new file mode 100644 index 00000000000..871f06a6d67 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/meta.json new file mode 100644 index 00000000000..7f1a6150971 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/orange.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..985bf7325ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..625c6b9017b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..258fe247494 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..f69ebe0c4cd Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK.png new file mode 100644 index 00000000000..6ae4222ed87 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon.png new file mode 100644 index 00000000000..d9f8f2ef3e7 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon_mask.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon_mask.png new file mode 100644 index 00000000000..0630d571ecf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/icon_mask.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-left.png new file mode 100644 index 00000000000..fa3d0940b05 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-right.png new file mode 100644 index 00000000000..43214b6f1c3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/meta.json new file mode 100644 index 00000000000..7f1a6150971 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/purple.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..2276a67e587 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..79528f0d686 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..707671571bc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..ed8fbfe0f80 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png new file mode 100644 index 00000000000..a97f9b3eb49 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon.png new file mode 100644 index 00000000000..61f53177f7b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon_mask.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon_mask.png new file mode 100644 index 00000000000..17174691ecc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/icon_mask.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-left.png new file mode 100644 index 00000000000..e0ca01ff392 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-right.png new file mode 100644 index 00000000000..74733983a7d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/meta.json new file mode 100644 index 00000000000..7f1a6150971 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/white.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..1fc799bee66 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..7a86bc57f7e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e236ee5b083 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK-vox.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..59cd8e59694 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK.png new file mode 100644 index 00000000000..549a42b796a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon.png new file mode 100644 index 00000000000..54a1c6f592f Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon_mask.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon_mask.png new file mode 100644 index 00000000000..1a9932016bf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/icon_mask.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-left.png new file mode 100644 index 00000000000..8b6a7a09153 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-right.png new file mode 100644 index 00000000000..4fa7159028e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/meta.json new file mode 100644 index 00000000000..7f1a6150971 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Bandanas/yellow.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..23dc1239505 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-equipped-HELMET.png new file mode 100644 index 00000000000..5b2a03367ee Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-left.png new file mode 100644 index 00000000000..c4ebbcbd82a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-right.png new file mode 100644 index 00000000000..898d317e637 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon.png new file mode 100644 index 00000000000..245259124e2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon_flipped.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon_flipped.png new file mode 100644 index 00000000000..b9b02cc5f7b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/icon_flipped.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-left.png new file mode 100644 index 00000000000..b4094ff07db Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-right.png new file mode 100644 index 00000000000..fa257b9557a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/meta.json new file mode 100644 index 00000000000..a29360acd8b --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Soft/brownsoft.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_flipped" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-equipped-HELMET", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/equipped-NECK.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/equipped-NECK.png new file mode 100644 index 00000000000..d1de6fdd916 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/icon.png new file mode 100644 index 00000000000..20e1262edbd Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-left.png new file mode 100644 index 00000000000..aa920a4f17b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-right.png new file mode 100644 index 00000000000..f60d44e095e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/meta.json new file mode 100644 index 00000000000..c46de0c0d26 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/cyan.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/equipped-NECK.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/equipped-NECK.png new file mode 100644 index 00000000000..082b891e488 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/icon.png new file mode 100644 index 00000000000..5c47821b5e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-left.png new file mode 100644 index 00000000000..b46c1bebaf4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-right.png new file mode 100644 index 00000000000..d06dd4fe562 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/meta.json new file mode 100644 index 00000000000..c46de0c0d26 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Neck/Scarfs/yellow.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/legendary-golden-weh.png b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/legendary-golden-weh.png new file mode 100644 index 00000000000..7da3c06aab3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/legendary-golden-weh.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json index 2ef0d97e2d6..e61434a2cb7 100644 --- a/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json @@ -234,6 +234,9 @@ }, { "name": "raisya" + }, + { + "name": "legendary-golden-weh" } ] }