diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index b2631d49f2f..8ef841ebe4e 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -70,6 +70,7 @@ public sealed class PostMapInitTest // "Europa", // De-rotated, has significant issues. "Meta", // Maintained by Ichai "Cyberiad", // Maintained by Ichai + "SS14RUCyberiad", // WWDP variant "Lambda", // Maintained by Ichai "Bagel", // Maintained by Ichai "Northway", // Maintained by Violet diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl deleted file mode 100644 index da4db530b4e..00000000000 --- a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl +++ /dev/null @@ -1,5 +0,0 @@ -advertisement-pride-1 = Be gay do crime! -advertisement-pride-2 = Full of colors! -advertisement-pride-3 = You are valid! -thankyou-pride-1 = Go, do some crime! -thankyou-pride-2 = Have a colorful day! diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl deleted file mode 100644 index 9d7ece7aa5d..00000000000 --- a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled } - .desc = { ent-CrateVendingMachineRestockPrideFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl index c962f83e877..05e6012afe0 100644 --- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,5 +1,2 @@ -ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate - .desc = Contains a restock box for the Pride-O-Mat. - ent-CrateVendingMachineRestockSustenanceFilled = Sustenance vendor restock crate .desc = Contains a restock box for the sustenance vendor. diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl index fde896df39b..a1ee5e0c823 100644 --- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl +++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl @@ -34,7 +34,6 @@ holiday-name-garbage-day = Garbage Day holiday-name-international-picnic-day = International Picnic Day holiday-name-fathers-day = Father's Day holiday-name-summer-solstice = Summer Solstice -holiday-name-stonewall-riots-anniversary = Stonewall Riots Anniversary holiday-name-doctor-day = Doctor's Day holiday-name-ufo-day = UFO Day holiday-name-us-independence-day = US Independence Day @@ -44,20 +43,16 @@ holiday-name-friendship-day = Friendship Day holiday-name-beer-day = Beer Day holiday-name-talk-like-a-pirate-day = Talk-Like-a-Pirate Day holiday-name-programmers-day = Programmers' Day -holiday-name-bisexual-pride-day = Bisexual Pride Day holiday-name-stupid-questions-day = Stupid-Questions Day holiday-name-animals-day = Animal's Day holiday-name-smiling-day = Smiling Day -holiday-name-lesbian-day = Lesbian Day holiday-name-canadian-thanksgiving = Thanksgiving in Canada -holiday-name-spirit-day = Spirit Day holiday-name-halloween = Halloween holiday-name-vegan-day = Vegan Day holiday-name-armistice-day = Armistice Day holiday-name-kindness-day = Kindness Day holiday-name-life-day = Life Day holiday-name-flowers-day = Flower's Day -holiday-name-transgender-remembrance-day = Transgender Day of Remembrance holiday-name-saying-hello-day = Saying Hello Day holiday-name-thanksgiving = Thanksgiving in the United States holiday-name-sinterklaas = Sinterklaas @@ -68,7 +63,6 @@ holiday-name-christmas = Christmas holiday-name-festive-season = Festive Season holiday-name-boxing-day = Boxing Day holiday-name-friday-thirteenth = Friday the 13th -holiday-name-national-coming-out-day = National Coming Out Day ## Custom congrats diff --git a/Resources/Locale/ru-RU/WWDP_TRANSLATION/_MainS/entity.ftl b/Resources/Locale/ru-RU/WWDP_TRANSLATION/_MainS/entity.ftl index 5bd54bb45ea..b9ce3fec7e6 100644 --- a/Resources/Locale/ru-RU/WWDP_TRANSLATION/_MainS/entity.ftl +++ b/Resources/Locale/ru-RU/WWDP_TRANSLATION/_MainS/entity.ftl @@ -1710,9 +1710,6 @@ ent-BaseVendingMachineRestockDeltaV = коробка пополнения авт .desc = Коробка для пополнения торговых автоматов корпоративными вкусностями. -ent-VendingMachineRestockPride = коробка пополнения Pride-O-Mat - .desc = Станции срочно нужно больше плюшевых акул, и ты это знаешь. - ent-VendingMachineRestockSustenance = коробка пополнения автомата с едой .desc = Заключённые тоже должны есть. Никто не говорил, что вкусно. @@ -1853,9 +1850,6 @@ ent-SyndicateMonitoringServer = подозрительный сервер мон .desc = Получает и передаёт данные с сенсоров скафандров. -ent-VendingMachinePride = Pride-O-Mat - .desc = Торговый автомат, полный преступлений. - ent-VendingMachineCourierDrobe = КурьерДроб .desc = Ни солнечные вспышки, ни метеоры, ни плазменный огонь, ни вакуум космоса не остановят этих курьеров от своевременной доставки. @@ -3244,9 +3238,6 @@ ent-ClothingNeckPinBase = значок .desc = будь ничем — творя преступления -ent-ClothingNeckGayPin = гей значок - .desc = будь гей — и пусть весь мир подождёт - ent-ClothingNeckAutismPin = аутичный значок .desc = будь аутистом — игнорируй правила @@ -5106,9 +5097,6 @@ ent-MobWatcherIcewing = ледокрылый наблюдатель ent-MobWatcherMagmawing = магмокрылый наблюдатель -ent-MobWatcherPride = прайд-наблюдатель - .desc = Редкий подвид, появляющийся только в июне. Яркий. Грозный. Горд. - ent-MobLivingLight = световое существо .desc = Сияющая фигура из чистого света. И вроде как бесплотная. Но обжечься можно. @@ -7357,9 +7345,6 @@ ent-SyndieHandyFlag = ручной флаг Синдиката .desc = Для настоящих бунтарей. Смерть NT! -ent-LGBTQHandyFlag = ЛГБТ-флажок - .desc = Будь геем, твори беззаконие. - ent-PirateHandyFlag = пиратский флажок .desc = Подними его, и пусть эти карпы знают, что ты не шутки шутить пришёл. @@ -9754,9 +9739,6 @@ ent-SyndieFlag = флаг Синдиката .desc = Пахнет кровью. Смерть NT! -ent-LGBTQFlag = флаг ЛГБТК+ - .desc = Флаг «Будь геем — нарушай закон». - ent-PirateFlag = пиратский флаг .desc = Поднять весёлого Роджера, сорванцы! diff --git a/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/cloaks.ftl index 52c5cb07af8..2f314154b3b 100644 --- a/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/cloaks.ftl @@ -46,10 +46,6 @@ ent-ClothingNeckCloakMiner = плащ шахтёра .desc = Его носят самые опытные шахтеры, способные сдвинуть горы и засыпать долины. .suffix = { "" } -ent-ClothingNeckCloakTrans = вампирский плащ - .desc = Его носят высокопоставленные вампиры из трансильванского общества вампиров. - .suffix = { "" } - ent-ClothingNeckCloakGoliathCloak = плащ голиафа .desc = Плащ, сшитый из шкуры фауны с далекой планеты, хотя с возрастом его защитная ценность утратилась. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/pins.ftl deleted file mode 100644 index 87823986d21..00000000000 --- a/Resources/Locale/ru-RU/WWDP_TRANSLATION/prototypes/entities/clothing/neck/pins.ftl +++ /dev/null @@ -1,35 +0,0 @@ -ent-ClothingNeckLGBTPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckAromanticPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckAsexualPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckBisexualPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckIntersexPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckLesbianPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckNonBinaryPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckPansexualPin = pin - .desc = pin - .suffix = { "" } - -ent-ClothingNeckTransPin = pin - .desc = pin - .suffix = { "" } diff --git a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl deleted file mode 100644 index a694b4e198d..00000000000 --- a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl +++ /dev/null @@ -1,5 +0,0 @@ -advertisement-pride-1 = Будь собой, твори беззаконие! -advertisement-pride-2 = Полон красок! -advertisement-pride-3 = С тобой всё так! -thankyou-pride-1 = Вперёд, нарушать закон! -thankyou-pride-2 = Красочного дня! diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/cargo/cargo-vending.ftl deleted file mode 100644 index 40da57598c8..00000000000 --- a/Resources/Locale/ru-RU/deltav/prototypes/catalog/cargo/cargo-vending.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled } - .desc = { ent-CrateVendingMachineRestockPrideFilled.desc } diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl index 76af3ca1293..eff7fef46a2 100644 --- a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,5 +1,2 @@ -ent-CrateVendingMachineRestockPrideFilled = Ящик для пополнения "Прайд-О-Мата" - .desc = Содержит коробку для пополнения запасов "Прайд-О-Мата". - ent-CrateVendingMachineRestockSustenanceFilled = Ящик для пополнения автомата с едой .desc = Содержит коробку для пополнения запасов автомата с едой. diff --git a/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl b/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl index 868ea4226e6..6be85fe1f93 100644 --- a/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl +++ b/Resources/Locale/ru-RU/holiday/greet/holiday-greet.ftl @@ -36,7 +36,6 @@ holiday-name-garbage-day = Дня мусора holiday-name-international-picnic-day = Международного дня пикника holiday-name-fathers-day = Дня отца holiday-name-summer-solstice = летнего солнцестояния -holiday-name-stonewall-riots-anniversary = День Дня holiday-name-doctor-day = День Дня holiday-name-ufo-day = Международного дня НЛО holiday-name-us-independence-day = День Дня @@ -46,20 +45,16 @@ holiday-name-friendship-day = Дня дружбы holiday-name-beer-day = Дня пива holiday-name-talk-like-a-pirate-day = Дня «Говори как пират» holiday-name-programmers-day = Дня программиста -holiday-name-bisexual-pride-day = День Дня holiday-name-stupid-questions-day = Дня глупых вопросов holiday-name-animals-day = Дня защиты животных holiday-name-smiling-day = Дня улыбки -holiday-name-lesbian-day = День Дня holiday-name-canadian-thanksgiving = День Дня -holiday-name-spirit-day = Дня сильных духом holiday-name-halloween = Хэллоуина holiday-name-vegan-day = День Дня holiday-name-armistice-day = Дня перемирия holiday-name-kindness-day = Дня доброты holiday-name-life-day = День Дня holiday-name-flowers-day = Дня цветов -holiday-name-transgender-remembrance-day = День Дня holiday-name-saying-hello-day = Дня приветствий holiday-name-thanksgiving = День Дня holiday-name-sinterklaas = Синтерклааса @@ -70,7 +65,6 @@ holiday-name-christmas = католического Рождества holiday-name-festive-season = наступающего Нового года holiday-name-boxing-day = Дня подарков holiday-name-friday-thirteenth = Дня неприятностей -holiday-name-national-coming-out-day = День Дня ## Custom congrats diff --git a/Resources/Maps/Dungeon/haunted.yml b/Resources/Maps/Dungeon/haunted.yml index d63ca74f200..06440e62c9e 100644 --- a/Resources/Maps/Dungeon/haunted.yml +++ b/Resources/Maps/Dungeon/haunted.yml @@ -563,17 +563,6 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage -- proto: ClothingNeckCloakTrans - entities: - - uid: 332 - components: - - flags: InContainer - type: MetaData - - parent: 331 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingOuterHardsuitSalvage entities: - uid: 432 diff --git a/Resources/Maps/Misc/terminal.yml b/Resources/Maps/Misc/terminal.yml index a4aa75a2e3c..789f251fd0f 100644 --- a/Resources/Maps/Misc/terminal.yml +++ b/Resources/Maps/Misc/terminal.yml @@ -19555,13 +19555,6 @@ entities: - type: Transform pos: -28.440887,17.64114 parent: 2 -- proto: ClothingNeckLGBTPin - entities: - - uid: 8195 - components: - - type: Transform - pos: 2.6020877,-21.379698 - parent: 2 - proto: ClothingNeckScarfStripedBlack entities: - uid: 8060 diff --git a/Resources/Maps/_White/Kettle.yml b/Resources/Maps/_White/Kettle.yml index a013a6742c1..c9a6dc248a9 100644 --- a/Resources/Maps/_White/Kettle.yml +++ b/Resources/Maps/_White/Kettle.yml @@ -67742,13 +67742,6 @@ entities: - type: Transform pos: -9.277243,-53.417923 parent: 82 -- proto: ClothingNeckAsexualPin - entities: - - uid: 7133 - components: - - type: Transform - pos: -0.7473192,-39.581512 - parent: 82 - proto: ClothingNeckBling entities: - uid: 12187 @@ -67777,13 +67770,6 @@ entities: - type: Transform pos: -11.35714,-6.7504005 parent: 82 -- proto: ClothingNeckPansexualPin - entities: - - uid: 7253 - components: - - type: Transform - pos: 24.309896,47.73986 - parent: 82 - proto: ClothingNeckScarfStripedGreen entities: - uid: 4126 @@ -79464,63 +79450,63 @@ entities: pos: 44.5,-13.5 parent: 82 - type: FaxMachine - name: Бриг + name: Бриг - uid: 2981 components: - type: Transform pos: -13.5,-28.5 parent: 82 - type: FaxMachine - name: Офис Репортёра + name: Офис Репортёра - uid: 8037 components: - type: Transform pos: -53.5,2.5 parent: 82 - type: FaxMachine - name: Детектив + name: Детектив - uid: 12215 components: - type: Transform pos: 60.5,-7.5 parent: 82 - type: FaxMachine - name: Офис ХОСа + name: Офис РҐРћРЎР° - uid: 13941 components: - type: Transform pos: -42.5,-34.5 parent: 82 - type: FaxMachine - name: Офис СМО + name: Офис РЎРњРћ - uid: 16804 components: - type: Transform pos: -21.5,-29.5 parent: 82 - type: FaxMachine - name: Офис Психолога + name: Офис Психолога - uid: 21620 components: - type: Transform pos: -8.5,-53.5 parent: 82 - type: FaxMachine - name: Мим + name: РњРёРј - uid: 22696 components: - type: Transform pos: 27.5,-22.5 parent: 82 - type: FaxMachine - name: Офис Адвоката + name: Офис Адвоката - uid: 25868 components: - type: Transform pos: 6.5,-13.5 parent: 82 - type: FaxMachine - name: Мостик + name: Мостик destinationAddress: Bridge - uid: 25874 components: @@ -79528,28 +79514,28 @@ entities: pos: 29.5,59.5 parent: 82 - type: FaxMachine - name: РНД + name: Р РќР” - uid: 25875 components: - type: Transform pos: -12.5,39.5 parent: 82 - type: FaxMachine - name: Инженерный Отдел + name: ?????????? ????? - uid: 25880 components: - type: Transform pos: -51.5,-27.5 parent: 82 - type: FaxMachine - name: Медицинский Отдел + name: Медицинский Отдел - uid: 25881 components: - type: Transform pos: -11.5,-0.5 parent: 82 - type: FaxMachine - name: Офис ХОПа + name: Офис РҐРћРџР° - uid: 25887 components: - type: Transform @@ -79559,14 +79545,14 @@ entities: - type: Physics bodyType: Dynamic - type: FaxMachine - name: Логистика + name: Логистика - uid: 25889 components: - type: Transform pos: 52.5,-39.5 parent: 82 - type: FaxMachine - name: Пермабриг + name: Пермабриг - proto: FaxMachineCaptain entities: - uid: 26681 @@ -122722,7 +122708,7 @@ entities: parent: 82 - type: Paper content: > - Ты думал здесь что-то будет? + РўС‹ думал здесь что-то будет? - uid: 25872 components: - type: Transform @@ -123246,7 +123232,7 @@ entities: - uid: 26594 components: - type: MetaData - name: святой дух + name: святой РґСѓС… - type: Transform pos: -9.407837,33.592533 parent: 82 @@ -151150,7 +151136,7 @@ entities: - uid: 26593 components: - type: MetaData - desc: Фигурка, изображающая священника, молящегося о богоугодных вещах. Валейфар. + desc: Фигурка, изображающая священника, молящегося Рѕ богоугодных вещах. Валейфар. - type: Transform pos: -15.631889,8.744456 parent: 82 @@ -151173,7 +151159,7 @@ entities: - uid: 26592 components: - type: MetaData - desc: Фигурка, изображающая клоуна. Вы с содроганием думаете о том, что же, возможно, люди уже успели сделать с этой фигуркой. Дудлз. + desc: Фигурка, изображающая клоуна. Р’С‹ СЃ содроганием думаете Рѕ том, что же, возможно, люди уже успели сделать СЃ этой фигуркой. Дудлз. - type: Transform pos: -15.277721,8.661123 parent: 82 @@ -151182,7 +151168,7 @@ entities: - uid: 26596 components: - type: MetaData - desc: Фигурка, изображающая юриста в свежепошитом костюме. Рэйчел Синклер. + desc: Фигурка, изображающая юриста РІ свежепошитом костюме. Рэйчел Синклер. - type: Transform pos: 60.70382,-16.352417 parent: 82 @@ -151191,14 +151177,14 @@ entities: - uid: 26597 components: - type: MetaData - desc: Фигурка, изображающая врача, в халате и со шприцем. Кор Кардэн + desc: "Вырванный плакат: текст размазан и почти нечитаем." - type: Transform pos: -49.706615,-26.172882 parent: 82 - uid: 26598 components: - type: MetaData - desc: Фигурка, изображающая врача, в халате и со шприцем. Вета Игрит. + desc: "Потрёпанный плакат с выцветшими каракулями, ничего не разобрать." - type: Transform pos: -49.52953,-26.329132 parent: 82 @@ -151207,7 +151193,7 @@ entities: - uid: 26595 components: - type: MetaData - desc: Фигурка, изображающая прославленного главу научного отдела. Александр Милоухов. + desc: Фигурка, изображающая прославленного главу научного отдела. Александр Милоухов. - type: Transform pos: 29.518936,63.57479 parent: 82 diff --git a/Resources/Maps/_White/Moose.yml b/Resources/Maps/_White/Moose.yml index 7fac49af5d4..1bf6006ec77 100644 --- a/Resources/Maps/_White/Moose.yml +++ b/Resources/Maps/_White/Moose.yml @@ -91127,16 +91127,6 @@ entities: - type: Transform pos: -29.524712,-14.356471 parent: 2 -- proto: VendingMachineRestockPride - entities: - - uid: 8937 - components: - - type: Transform - pos: -53.490845,-46.68229 - parent: 2 - - type: Physics - angularDamping: 0 - linearDamping: 0 - proto: VendingMachineRestockTankDispenser entities: - uid: 14610 diff --git a/Resources/Maps/_White/WhiteMeta.yml b/Resources/Maps/_White/WhiteMeta.yml index c7a1f0bfe50..86b2d60eda7 100644 --- a/Resources/Maps/_White/WhiteMeta.yml +++ b/Resources/Maps/_White/WhiteMeta.yml @@ -62730,13 +62730,6 @@ entities: - type: Transform pos: 6.498452,-14.246428 parent: 2 -- proto: ClothingNeckCloakTrans - entities: - - uid: 9831 - components: - - type: Transform - pos: -12.481159,-67.51491 - parent: 2 - proto: ClothingNeckHeadphones entities: - uid: 9832 @@ -77157,7 +77150,7 @@ entities: - uid: 27664 components: - type: MetaData - desc: L̵̃ͅǪ̶͗A̴̙̅F̸͓̎ + desc: LМµМѓН…OМ¶Н—МЁAМґМ…М™FМёМЋН“ name: Forbidden loaf - type: Transform parent: 27663 diff --git a/Resources/Maps/anchor.yml b/Resources/Maps/anchor.yml index 868a07e7b55..cb7abdd0050 100644 --- a/Resources/Maps/anchor.yml +++ b/Resources/Maps/anchor.yml @@ -13508,8 +13508,8 @@ entities: - uid: 102 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: шлюз + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: шлюз - type: Transform pos: 69.5,60.5 parent: 2 @@ -13677,8 +13677,8 @@ entities: - uid: 124 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: рамка стеклянного шлюза + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: рамка стеклянного шлюза - type: Transform pos: 64.5,59.5 parent: 2 @@ -15199,8 +15199,8 @@ entities: - uid: 278 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: внешний шлюз + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: внешний шлюз - type: Transform pos: 74.5,56.5 parent: 2 @@ -15215,8 +15215,8 @@ entities: - uid: 279 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: внешний шлюз + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: внешний шлюз - type: Transform rot: 3.141592653589793 rad pos: 79.5,57.5 @@ -15455,7 +15455,7 @@ entities: components: - type: MetaData desc: I'm escaping to the one place that hasn't been corrupted by capitalism! - name: эвакуация + name: эвакуация - type: Transform rot: 3.141592653589793 rad pos: 63.5,63.5 @@ -16125,16 +16125,16 @@ entities: - uid: 374 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: стеклянный шлюз + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: стеклянный шлюз - type: Transform pos: 63.5,59.5 parent: 2 - uid: 375 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: стеклянный шлюз + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: стеклянный шлюз - type: Transform pos: 69.5,56.5 parent: 2 @@ -16569,32 +16569,32 @@ entities: - uid: 432 components: - type: MetaData - desc: Он открывается, закрывается и, возможно, раздавит вас. - name: солнечный + desc: РћРЅ открывается, закрывается Рё, возможно, раздавит вас. + name: солнечный - type: Transform pos: 71.5,45.5 parent: 2 - uid: 433 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: северные панели + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: северные панели - type: Transform pos: 72.5,54.5 parent: 2 - uid: 434 components: - type: MetaData - desc: Он открывается, закрывается, и может раздавить вас. - name: северные панели + desc: РћРЅ открывается, закрывается, Рё может раздавить вас. + name: северные панели - type: Transform pos: 71.5,54.5 parent: 2 - uid: 435 components: - type: MetaData - desc: Он открывается, закрывается и, возможно, раздавит вас. - name: солнечный + desc: РћРЅ открывается, закрывается Рё, возможно, раздавит вас. + name: солнечный - type: Transform pos: 72.5,45.5 parent: 2 @@ -21238,7 +21238,7 @@ entities: - uid: 1140 components: - type: MetaData - desc: This one says 'ᶠᵘⁿ'. + desc: This one says 'ISOLATION'. name: isolation - type: Transform pos: -76.5,-73.5 @@ -21290,7 +21290,7 @@ entities: - uid: 1145 components: - type: MetaData - desc: This one says 'FREE AIRᵇᵘᵈ'. + desc: This one says 'FREE AIR'. name: EVA - type: Transform pos: -19.5,-19.5 @@ -77519,14 +77519,6 @@ entities: - type: Transform pos: -31.286428,-54.622658 parent: 2 -- proto: ClothingNeckCloakAce - entities: - - uid: 12074 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.525635,-30.416811 - parent: 2 - proto: ClothingNeckCloakMoth entities: - uid: 12075 @@ -137857,7 +137849,7 @@ entities: - uid: 20994 components: - type: MetaData - desc: Safety Moth™ lets you know that while ALL the cool kids smoke, it causes cancer, it can also lower your immune system and make you susceptible to all kinds of other diseases and not to mention second hand smoke which can do the same to innocent bystanders! + desc: Safety Mothв„ў lets you know that while ALL the cool kids smoke, it causes cancer, it can also lower your immune system and make you susceptible to all kinds of other diseases and not to mention second hand smoke which can do the same to innocent bystanders! name: Safety Moth - Smoking - type: Transform pos: -32.5,-46.5 @@ -137867,7 +137859,7 @@ entities: - uid: 20995 components: - type: MetaData - desc: This informational poster uses Safety Moth™ to tell the viewer that they really exist. "You're more than just pixels, you are you!" + desc: This informational poster uses Safety Mothв„ў to tell the viewer that they really exist. "You're more than just pixels, you are you!" name: Safety Moth - Motivational - type: Transform pos: 73.5,3.5 @@ -156118,8 +156110,8 @@ entities: - uid: 24192 components: - type: MetaData - desc: энергия течет к людям. - name: российский спутник substation + desc: энергия течет Рє людям. + name: СЂРѕСЃСЃРёР№СЃРєРёР№ спутник substation - type: Transform pos: 76.5,59.5 parent: 2 diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index bd5465090d8..9346019dfea 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -64629,13 +64629,6 @@ entities: - type: Transform pos: 13.5,-20.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 9977 - components: - - type: Transform - pos: 12.5,-3.5 - parent: 2 - proto: VendingMachineRepDrobe entities: - uid: 9978 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index fa8231f639c..d14aa11aee2 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -60108,20 +60108,6 @@ entities: - type: Transform pos: -41.75516,14.452198 parent: 2 -- proto: ClothingNeckAromanticPin - entities: - - uid: 9306 - components: - - type: Transform - pos: 83.621025,-13.51627 - parent: 2 -- proto: ClothingNeckBisexualPin - entities: - - uid: 9307 - components: - - type: Transform - pos: -20.494595,5.7531924 - parent: 2 - proto: ClothingNeckBling entities: - uid: 9308 @@ -60139,13 +60125,6 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 -- proto: ClothingNeckCloakTrans - entities: - - uid: 9310 - components: - - type: Transform - pos: -40.498245,-36.02266 - parent: 2 - proto: ClothingNeckHeadphones entities: - uid: 9311 @@ -60158,27 +60137,6 @@ entities: - type: Transform pos: -38.4609,19.6876 parent: 2 -- proto: ClothingNeckIntersexPin - entities: - - uid: 9313 - components: - - type: Transform - pos: -12.770909,19.336336 - parent: 2 -- proto: ClothingNeckLesbianPin - entities: - - uid: 9314 - components: - - type: Transform - pos: -10.308835,13.564301 - parent: 2 -- proto: ClothingNeckLGBTPin - entities: - - uid: 9315 - components: - - type: Transform - pos: -11.221505,22.789167 - parent: 2 - proto: ClothingNeckMantleCMO entities: - uid: 9317 @@ -60215,13 +60173,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingNeckNonBinaryPin - entities: - - uid: 9322 - components: - - type: Transform - pos: -6.8039737,15.288539 - parent: 2 - proto: ClothingNeckScarfStripedBlue entities: - uid: 9323 @@ -60289,13 +60240,6 @@ entities: - type: Transform pos: -63.651737,-1.4881696 parent: 2 -- proto: ClothingNeckTransPin - entities: - - uid: 9334 - components: - - type: Transform - pos: -8.970711,16.51249 - parent: 2 - proto: ClothingOuterApron entities: - uid: 9335 @@ -108923,13 +108867,6 @@ entities: - type: Transform pos: 21.334734,-11.3924055 parent: 2 -- proto: LGBTQHandyFlag - entities: - - uid: 16608 - components: - - type: Transform - pos: -41.49743,-36.512333 - parent: 2 - proto: LightBulb entities: - uid: 16609 diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 22742ce5ca5..7fa25d951bb 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -60494,37 +60494,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingNeckAromanticPin - entities: - - uid: 8657 - components: - - type: Transform - pos: -36.65023,-44.33171 - parent: 2 - - uid: 8658 - components: - - type: Transform - pos: -19.327265,17.651068 - parent: 2 -- proto: ClothingNeckAsexualPin - entities: - - uid: 8659 - components: - - type: Transform - pos: -19.65906,17.512405 - parent: 2 - - uid: 8660 - components: - - type: Transform - pos: -36.55648,-44.89421 - parent: 2 -- proto: ClothingNeckBisexualPin - entities: - - uid: 8661 - components: - - type: Transform - pos: -35.99398,-44.4489 - parent: 2 - proto: ClothingNeckBling entities: - uid: 8662 @@ -60539,63 +60508,6 @@ entities: - type: Transform pos: -31.430737,31.650105 parent: 2 -- proto: ClothingNeckCloakTrans - entities: - - uid: 8664 - components: - - type: Transform - pos: 28.5,-33.5 - parent: 2 -- proto: ClothingNeckIntersexPin - entities: - - uid: 8665 - components: - - type: Transform - pos: -35.829918,-43.933273 - parent: 2 -- proto: ClothingNeckLesbianPin - entities: - - uid: 8666 - components: - - type: Transform - pos: -36.040855,-45.058273 - parent: 2 -- proto: ClothingNeckLGBTPin - entities: - - uid: 8667 - components: - - type: Transform - pos: -53.645718,-60.37925 - parent: 2 - - uid: 8668 - components: - - type: Transform - pos: -37.58773,-44.70671 - parent: 2 - - uid: 8669 - components: - - type: Transform - pos: -34.658043,-44.54265 - parent: 2 -- proto: ClothingNeckNonBinaryPin - entities: - - uid: 8670 - components: - - type: Transform - pos: -53.317593,-60.37925 - parent: 2 - - uid: 8671 - components: - - type: Transform - pos: -35.43148,-45.058273 - parent: 2 -- proto: ClothingNeckPansexualPin - entities: - - uid: 8672 - components: - - type: Transform - pos: -35.197105,-44.284836 - parent: 2 - proto: ClothingNeckScarfStripedZebra entities: - uid: 8673 @@ -104652,30 +104564,6 @@ entities: parent: 8592 - type: Physics canCollide: False -- proto: LGBTQFlag - entities: - - uid: 15146 - components: - - type: Transform - pos: -36.5,-42.5 - parent: 2 -- proto: LGBTQHandyFlag - entities: - - uid: 15147 - components: - - type: Transform - pos: -37.611168,-43.58171 - parent: 2 - - uid: 15148 - components: - - type: Transform - pos: -34.540855,-43.534836 - parent: 2 - - uid: 15149 - components: - - type: Transform - pos: 29.482407,-33.45202 - parent: 2 - proto: LiquidNitrogenCanister entities: - uid: 15150 diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index a2578086a44..62eefa2c7c3 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -96226,13 +96226,6 @@ entities: - type: Transform pos: -17.5,11.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 14757 - components: - - type: Transform - pos: -2.5,6.5 - parent: 2 - proto: VendingMachineRepDrobe entities: - uid: 14758 diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml index 3e763823148..15c1b8941e4 100644 --- a/Resources/Maps/europa.yml +++ b/Resources/Maps/europa.yml @@ -37081,13 +37081,6 @@ entities: linearDamping: 0 canCollide: False - type: InsideEntityStorage -- proto: ClothingNeckTransPin - entities: - - uid: 11220 - components: - - type: Transform - pos: -39.29348,-0.7646979 - parent: 1 - proto: ClothingOuterCoatMantis entities: - uid: 4654 diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 6095f0963a4..19c85c18877 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -112988,13 +112988,6 @@ entities: - type: Transform pos: 30.5,8.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 16072 - components: - - type: Transform - pos: -11.5,-7.5 - parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 16074 diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 4119f4c5f8a..a19aa7d8cb6 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -245700,13 +245700,6 @@ entities: - type: Transform pos: -34.5,-12.5 parent: 1 -- proto: VendingMachinePride - entities: - - uid: 2577 - components: - - type: Transform - pos: -55.5,33.5 - parent: 1 - proto: VendingMachineRepDrobe entities: - uid: 8012 diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 549d91fa836..b05a0ecc32a 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -157746,13 +157746,6 @@ entities: - type: Transform pos: -3.5,21.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 23354 - components: - - type: Transform - pos: 29.5,-11.5 - parent: 2 - proto: VendingMachinePwrGame entities: - uid: 23355 diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index a4549119dc7..b7117e32fe5 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -46646,9 +46646,6 @@ entities: entities: - uid: 6988 components: - - type: MetaData - desc: Happy pride month! - name: pride month crown - type: Transform pos: -55.447285,-35.27587 parent: 2 @@ -46757,13 +46754,6 @@ entities: - type: Transform pos: -54.295135,50.98366 parent: 2 -- proto: ClothingNeckCloakTrans - entities: - - uid: 7006 - components: - - type: Transform - pos: -54.46124,-28.943243 - parent: 2 - proto: ClothingNeckScarfStripedGreen entities: - uid: 7007 @@ -124107,13 +124097,6 @@ entities: - type: Transform pos: -31.5,33.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 18760 - components: - - type: Transform - pos: -45.5,17.5 - parent: 2 - proto: VendingMachineRepDrobe entities: - uid: 18761 diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 198b43a41fb..5ec10d44941 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -152315,13 +152315,6 @@ entities: - type: Transform pos: 28.5,-19.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 23221 - components: - - type: Transform - pos: 25.5,19.5 - parent: 2 - proto: VendingMachineRepDrobe entities: - uid: 23222 diff --git a/Resources/Maps/northway.yml b/Resources/Maps/northway.yml index 5f6ccf9963f..d95fec15f3d 100644 --- a/Resources/Maps/northway.yml +++ b/Resources/Maps/northway.yml @@ -25838,13 +25838,6 @@ entities: - type: Transform pos: -31.5,3.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 3728 - components: - - type: Transform - pos: -8.5,6.5 - parent: 2 - proto: VendingMachineRobotics entities: - uid: 3729 diff --git a/Resources/Maps/radstation.yml b/Resources/Maps/radstation.yml index fa26a4a2250..bfa85ffdaed 100644 --- a/Resources/Maps/radstation.yml +++ b/Resources/Maps/radstation.yml @@ -19332,17 +19332,17 @@ entities: - uid: 1127 components: - type: MetaData - name: 'Sindicato: Uma ameaça?' + name: 'Sindicato: Uma ameaГ§a?' - type: Transform parent: 1126 - type: Paper content: >2- - Antes de tudo, quero esclarecer algumas coisas. Recomendo não buscar mais informações sobre o Sindicato ou qualquer coisa relacionada a ele. Se fizer isso, enfrentará um grande perigo e pode muito bem acabar sendo morto. Estou fazendo isso na tentativa de informar o máximo de pessoas possível sobre o que a NanoTrasen esconde. Algumas informações são bastante incertas devido à grande censura que ocorre pela NanoTrasen, e não poderei responder algumas dúvidas que surgirão ao longo deste livro. Por fim, espero que tenha uma boa leitura. + Antes de tudo, quero esclarecer algumas coisas. Recomendo nГЈo buscar mais informações sobre o Sindicato ou qualquer coisa relacionada a ele. Se fizer isso, enfrentarГЎ um grande perigo e pode muito bem acabar sendo morto. Estou fazendo isso na tentativa de informar o mГЎximo de pessoas possГ­vel sobre o que a NanoTrasen esconde. Algumas informações sГЈo bastante incertas devido Г  grande censura que ocorre pela NanoTrasen, e nГЈo poderei responder algumas dГєvidas que surgirГЈo ao longo deste livro. Por fim, espero que tenha uma boa leitura. Ass. Olivia Hass - [color=red]Este livro teve a circulação proibida e qualquer exemplar dele deve ser queimado.[/color] + [color=red]Este livro teve a circulação proibida e qualquer exemplar dele deve ser queimado.[/color] - type: Physics canCollide: False - uid: 1128 @@ -19354,40 +19354,40 @@ entities: parent: 1126 - type: Paper content: >- - Nas esferas do misticismo e das forças indomáveis, existe uma entidade de poder inigualável conhecida como o A Marionete Suprema. Apesar de seu nome, esse ser extraordinário está longe de ser uma marionete real; ele tem o tamanho de um humano médio, e sua aparência pode mudar de tempos em tempos. Ele incorpora uma misteriosa combinação de poder e consciência, exigindo um mestre para orientar suas ações. A natureza do Boneco está intrinsicamente ligada ao controle, sua existência depende de um mestre que pode aproveitar suas imensas capacidades. + Nas esferas do misticismo e das forГ§as indomГЎveis, existe uma entidade de poder inigualГЎvel conhecida como o A Marionete Suprema. Apesar de seu nome, esse ser extraordinГЎrio estГЎ longe de ser uma marionete real; ele tem o tamanho de um humano mГ©dio, e sua aparГЄncia pode mudar de tempos em tempos. Ele incorpora uma misteriosa combinação de poder e consciГЄncia, exigindo um mestre para orientar suas ações. A natureza do Boneco estГЎ intrinsicamente ligada ao controle, sua existГЄncia depende de um mestre que pode aproveitar suas imensas capacidades. - A Marionete Suprema possui um arsenal de habilidades e capacidades extraordinárias, tornando-o uma força a ser reconhecida. Quando o mestre emite um comando, a Marionete o executa com uma eficiência, habilidade e sutileza inigualáveis. Seja uma infiltração delicada, uma manobra estratégica ou uma exibição de poder bruto, a Marionete realiza sua ordem dada impecavelmente, sem deixar margem para erro. + A Marionete Suprema possui um arsenal de habilidades e capacidades extraordinГЎrias, tornando-o uma forГ§a a ser reconhecida. Quando o mestre emite um comando, a Marionete o executa com uma eficiГЄncia, habilidade e sutileza inigualГЎveis. Seja uma infiltração delicada, uma manobra estratГ©gica ou uma exibição de poder bruto, a Marionete realiza sua ordem dada impecavelmente, sem deixar margem para erro. - No entanto, a verdadeira arte da Marionete reside na teatralidade e intriga de seus comandos. O desempenho da Marionete está intrinsecamente ligado às habilidades criativas e teatrais de seu mestre. Quanto mais envolvente, cativante e dramático o cenário criado pelo mestre, mais pronunciada e extraordinária se torna a execução da Marionete. Um comando sem brilho teatral e mundano leva a resultados ineficientes ou falhas, enquanto uma ordem brilhantemente concebida e narrada desbloqueia todo o potencial das habilidades da Marionete. + No entanto, a verdadeira arte da Marionete reside na teatralidade e intriga de seus comandos. O desempenho da Marionete estГЎ intrinsecamente ligado Г s habilidades criativas e teatrais de seu mestre. Quanto mais envolvente, cativante e dramГЎtico o cenГЎrio criado pelo mestre, mais pronunciada e extraordinГЎria se torna a execução da Marionete. Um comando sem brilho teatral e mundano leva a resultados ineficientes ou falhas, enquanto uma ordem brilhantemente concebida e narrada desbloqueia todo o potencial das habilidades da Marionete. - Mas cuidado, pois a Marionete abriga uma inclinação secreta e traiçoeira. Se o mestre falhar repetidamente em cativar a Marionete com cenários fascinantes, a insatisfação penetra lentamente na consciência da entidade. À medida que a Marionete anseia por mais emoção e realização, o vínculo entre mestre e a Marionete começa a se fraturar. Gradualmente, o descontentamento da Marionete se transforma em uma animosidade perigosa, e com insatisfação suficiente, ela pode se voltar contra seu mestre com consequências letais. + Mas cuidado, pois a Marionete abriga uma inclinação secreta e traiГ§oeira. Se o mestre falhar repetidamente em cativar a Marionete com cenГЎrios fascinantes, a insatisfação penetra lentamente na consciГЄncia da entidade. ГЂ medida que a Marionete anseia por mais emoção e realização, o vГ­nculo entre mestre e a Marionete comeГ§a a se fraturar. Gradualmente, o descontentamento da Marionete se transforma em uma animosidade perigosa, e com insatisfação suficiente, ela pode se voltar contra seu mestre com consequГЄncias letais. - Assim, a Marionete Suprema caminha numa corda bamba delicada entre lealdade e rebelião, tornando a relação entre mestre e entidade uma dança precária. O mestre deve se esforçar continuamente para cativar e fascinar a Marionete, garantindo sua devoção e lealdade inabaláveis. De forma relativamente simples, esta entidade vê-se a si mesma como personagem de uma obra de ficção, ao mesmo tempo que vê o seu mestre como o criador da obra. + Assim, a Marionete Suprema caminha numa corda bamba delicada entre lealdade e rebeliГЈo, tornando a relação entre mestre e entidade uma danГ§a precГЎria. O mestre deve se esforГ§ar continuamente para cativar e fascinar a Marionete, garantindo sua devoção e lealdade inabalГЎveis. De forma relativamente simples, esta entidade vГЄ-se a si mesma como personagem de uma obra de ficção, ao mesmo tempo que vГЄ o seu mestre como o criador da obra. - Nas sombras do mistério e do poder oculto, a Marionete Suprema aguarda aqueles que ousam comandá-lo. Será você o escolhido para desbloquear seu potencial ilimitado, ou sucumbirá ao seu crescente descontentamento e enfrentará as consequências graves? A escolha reside em sua capacidade de domar o enigma da poderosa entidade que é a Marionete Suprema. + Nas sombras do mistГ©rio e do poder oculto, a Marionete Suprema aguarda aqueles que ousam comandГЎ-lo. SerГЎ vocГЄ o escolhido para desbloquear seu potencial ilimitado, ou sucumbirГЎ ao seu crescente descontentamento e enfrentarГЎ as consequГЄncias graves? A escolha reside em sua capacidade de domar o enigma da poderosa entidade que Г© a Marionete Suprema. - type: Physics canCollide: False - uid: 1129 components: - type: MetaData name: > - Catalogo de Magias Hiper Desenvolvidas #1: (Maldição) - Alegoria do Peso Perpétuo: + Catalogo de Magias Hiper Desenvolvidas #1: (Maldição) - Alegoria do Peso PerpГ©tuo: - type: Transform parent: 1126 - type: Paper content: >- - A pessoa afetada por esta maldição se encontra aprisionada em um ciclo interminável de tarefas exaustivas, sendo compelida a cumpri-las sem descanso. Trata-se de uma maldição cruel que mergulha a vítima em um estado de fadiga extrema, permitindo-lhe descansar apenas quando seu corpo sucumbe ao desmaio. + A pessoa afetada por esta maldição se encontra aprisionada em um ciclo interminГЎvel de tarefas exaustivas, sendo compelida a cumpri-las sem descanso. Trata-se de uma maldição cruel que mergulha a vГ­tima em um estado de fadiga extrema, permitindo-lhe descansar apenas quando seu corpo sucumbe ao desmaio. - Aqueles sob efeito da Alegoria do Peso Perpétuo vivenciam uma corrente interminável de tarefas, cujo número parece ser infinito. Essas tarefas podem variar em natureza, indo desde atividades físicas extenuantes até tarefas mentais exaustivas, sempre se adaptando às habilidades e destrezas individuais da vítima. A maldição não apenas exige que as tarefas sejam concluídas, mas também pressiona a pessoa afetada a executá-las com eficiência e perfeição, deixando pouco espaço para falhas. + Aqueles sob efeito da Alegoria do Peso PerpГ©tuo vivenciam uma corrente interminГЎvel de tarefas, cujo nГєmero parece ser infinito. Essas tarefas podem variar em natureza, indo desde atividades fГ­sicas extenuantes atГ© tarefas mentais exaustivas, sempre se adaptando Г s habilidades e destrezas individuais da vГ­tima. A maldição nГЈo apenas exige que as tarefas sejam concluГ­das, mas tambГ©m pressiona a pessoa afetada a executГЎ-las com eficiГЄncia e perfeição, deixando pouco espaГ§o para falhas. - Enquanto a Maldição do Peso Eterno é implacável em suas imposições de tarefas, ela concede à pessoa afetada um mínimo de livre-arbítrio. A vítima pode escolher a ordem em que realiza as tarefas e até mesmo o tipo de atividade que deseja empreender, dentro dos limites impostos pela maldição. Essa capacidade de escolha paradoxalmente intensifica o sofrimento da pessoa, pois ela deve decidir constantemente qual tarefa realizar, sabendo que nunca haverá um fim para essa demanda interminável. + Enquanto a Maldição do Peso Eterno Г© implacГЎvel em suas imposições de tarefas, ela concede Г  pessoa afetada um mГ­nimo de livre-arbГ­trio. A vГ­tima pode escolher a ordem em que realiza as tarefas e atГ© mesmo o tipo de atividade que deseja empreender, dentro dos limites impostos pela maldição. Essa capacidade de escolha paradoxalmente intensifica o sofrimento da pessoa, pois ela deve decidir constantemente qual tarefa realizar, sabendo que nunca haverГЎ um fim para essa demanda interminГЎvel. - type: Physics canCollide: False - proto: BookChemicalCompendium @@ -59325,27 +59325,6 @@ entities: - type: Transform pos: 19.387924,-13.55324 parent: 2 -- proto: ClothingNeckAsexualPin - entities: - - uid: 8843 - components: - - type: Transform - pos: 36.19758,26.417822 - parent: 2 -- proto: ClothingNeckCloakAce - entities: - - uid: 8844 - components: - - type: Transform - pos: 36.222733,26.699072 - parent: 2 -- proto: ClothingNeckCloakTrans - entities: - - uid: 8845 - components: - - type: Transform - pos: 36.63746,30.719614 - parent: 2 - proto: ClothingNeckClownmedal entities: - uid: 908 @@ -59383,13 +59362,6 @@ entities: - type: Transform pos: 20.564407,-13.356026 parent: 2 -- proto: ClothingNeckTransPin - entities: - - uid: 8850 - components: - - type: Transform - pos: 36.29247,30.486513 - parent: 2 - proto: ClothingOuterArmorBulletproof entities: - uid: 8851 @@ -71339,14 +71311,14 @@ entities: pos: -27.5,-32.5 parent: 2 - type: FaxMachine - name: Ciência + name: CiГЄncia - uid: 10784 components: - type: Transform pos: -8.5,31.5 parent: 2 - type: FaxMachine - name: Segurança + name: SeguranГ§a - uid: 10785 components: - type: Transform @@ -71388,14 +71360,14 @@ entities: pos: 26.5,-19.5 parent: 2 - type: FaxMachine - name: Médico Chefe + name: MГ©dico Chefe - uid: 10791 components: - type: Transform pos: 41.5,-25.5 parent: 2 - type: FaxMachine - name: Médica + name: MГ©dica - uid: 10792 components: - type: Transform @@ -71416,7 +71388,7 @@ entities: pos: -26.5,44.5 parent: 2 - type: FaxMachine - name: Segurança Chefe + name: SeguranГ§a Chefe - uid: 10795 components: - type: Transform @@ -71439,7 +71411,7 @@ entities: pos: -8.5,48.5 parent: 2 - type: FaxMachine - name: Capitão + name: CapitГЈo - proto: filingCabinetDrawerRandom entities: - uid: 10798 @@ -111819,40 +111791,40 @@ entities: - uid: 1227 components: - type: MetaData - name: Formulário de Trabalho + name: FormulГЎrio de Trabalho - type: Transform parent: 1226 - type: Paper content: >- - [color=#002159]█▀▀▀▀▀▀▀▀▀▀▀▀▀▀█▄ + [color=#002159]в–€в–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–€в–„ - █   ▀██   █▄     █           █ + в–€   в–Ђв–€в–€   в–€в–„     в–€           в–€ - █       ▀   █▀█▄█   ▄       █ [head=1]Nanotrasen[/head] + в–€       в–Ђ   в–€в–Ђв–€в–„в–€   в–„       в–€ [head=1]Nanotrasen[/head] - █           █     ▀█   ██▄   █ + в–€           в–€     в–Ђв–€   в–€в–€в–„   в–€ - ▀█▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ [head=1]Technologies[/head][/color] + в–Ђв–€в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–€ [head=1]Technologies[/head][/color] - [color=#002159][head=1] FORMULÁRIO DE TRABALHO [/head] + [color=#002159][head=1] FORMULГЃRIO DE TRABALHO [/head] [/color] - [head=2] Informações [/head] + [head=2] Informações [/head] Nome: Idade: - Raça: + RaГ§a: - Descrição: + Descrição: Habilidades: - Afiliação com a Nanotrasen: + Afiliação com a Nanotrasen: [color=#002159][head=2] Trabalho [/head][/color] @@ -111871,13 +111843,13 @@ entities: [bullet/] Este papel [bold][color=#ff0000]DEVE[/color][/bold] ser entregue ao head do departamento em que a pessoa quer o emprego. - [bullet/] Se você (head do departamento) permite que esta pessoa trabalhe no seu departamento, carimbe este papel e entregue no meu escritório. + [bullet/] Se vocГЄ (head do departamento) permite que esta pessoa trabalhe no seu departamento, carimbe este papel e entregue no meu escritГіrio. - [bullet/] Se você não permite, me avise pelo rádio ou simplesmente não devolva o papel. + [bullet/] Se vocГЄ nГЈo permite, me avise pelo rГЎdio ou simplesmente nГЈo devolva o papel. - [bullet/] Não irei dar trabalho para pessoas sem este papel estar carimbado. + [bullet/] NГЈo irei dar trabalho para pessoas sem este papel estar carimbado. - type: Physics canCollide: False - uid: 16286 @@ -112054,20 +112026,20 @@ entities: - stampedColor: '#006600FF' stampedName: stamp-component-stamped-name-centcom content: > - [color=#002159]█▀▀▀▀▀▀▀▀▀▀▀▀▀▀█▄ + [color=#002159]в–€в–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–Ђв–€в–„ - █   ▀██   █▄     █           █ + в–€   в–Ђв–€в–€   в–€в–„     в–€           в–€ - █       ▀   █▀█▄█   ▄       █ [head=1]Nanotrasen[/head] + в–€       в–Ђ   в–€в–Ђв–€в–„в–€   в–„       в–€ [head=1]Nanotrasen[/head] - █           █     ▀█   ██▄   █ + в–€           в–€     в–Ђв–€   в–€в–€в–„   в–€ - ▀█▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ [head=1]Technologies[/head][/color] + в–Ђв–€в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–„в–€ [head=1]Technologies[/head][/color] [bold]--------------------------------------------------------------------------[/bold] - O sistema de correios da estação ainda não estão terminados e ficará pronto em tempo inderteminado. Para entregar coisas em deptos especificos, adicionamos aberturas na maints de cada depto para entrega. + O sistema de correios da estação ainda nГЈo estГЈo terminados e ficarГЎ pronto em tempo inderteminado. Para entregar coisas em deptos especificos, adicionamos aberturas na maints de cada depto para entrega. - uid: 16319 components: - type: Transform @@ -123655,7 +123627,7 @@ entities: - uid: 18157 components: - type: MetaData - name: Espaçar + name: EspaГ§ar - type: Transform rot: -1.5707963267948966 rad pos: -19.502998,-33.73403 @@ -126680,7 +126652,7 @@ entities: - uid: 18464 components: - type: MetaData - name: SMES Telecomunicações + name: SMES Telecomunicações - type: Transform pos: 8.5,34.5 parent: 2 @@ -130235,7 +130207,7 @@ entities: - uid: 19070 components: - type: MetaData - name: Substation do Serviço + name: Substation do ServiГ§o - type: Transform pos: 10.5,27.5 parent: 2 @@ -130247,14 +130219,14 @@ entities: - uid: 19072 components: - type: MetaData - name: Substarion da Médica + name: Substarion da MГ©dica - type: Transform pos: 13.5,-2.5 parent: 2 - uid: 19073 components: - type: MetaData - name: Substation da Segurança + name: Substation da SeguranГ§a - type: Transform pos: -29.5,15.5 parent: 2 @@ -130278,7 +130250,7 @@ entities: - uid: 19077 components: - type: MetaData - name: Substation da Ciência + name: Substation da CiГЄncia - type: Transform pos: -22.5,-54.5 parent: 2 @@ -132184,7 +132156,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Área principal + id: ГЃrea principal - uid: 19276 components: - type: Transform @@ -151856,7 +151828,7 @@ entities: pos: -80.5,-52.5 parent: 2 - type: WarpPoint - location: Lançador + location: LanГ§ador - proto: WarpPointBombing entities: - uid: 22734 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 160183e51be..7f1d09089b5 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -29936,13 +29936,6 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 -- proto: ClothingNeckNonBinaryPin - entities: - - uid: 4813 - components: - - type: Transform - pos: 43.27403,-8.317395 - parent: 2 - proto: ClothingNeckScarfStripedBlue entities: - uid: 4814 @@ -59055,7 +59048,7 @@ entities: stampedBy: - stampedColor: '#006600FF' stampedName: stamp-component-stamped-name-centcom - content: "[color=#1b487e]███░███░░░░██░░░░[/color]\r\n[color=#1b487e]░██░████░░░██░░░░[/color]\r\n[color=#1b487e]░░█░██░██░░██░█░░[/color] [head=3]NanoTrasen[/head]\r\n[color=#1b487e]░░░░██░░██░██░██░[/color] [bold] NTSS-38a Saltern[/bold]\r\n[color=#1b487e]░░░░██░░░████░███[/color]\r\n=============================================\r\n NOTICE TO ENGINEERING STAFF\r\n=============================================\r\nDue to corporate restructuring, and the presence of an updated Mk8 Supermatter engine, we have decided to reduce operational costs on our newest model of \"Saltern\" class stations. This state of the art Supermatter engine costs 450 million Spesos to design, produce, and implement on our stations. We have opted to save on operational costs by not supplying this station with an Antimatter Engine, which we should remind you, costs 150 Million Spesos to produce. \n\nIf you are lacking in qualified and trained engineering personnel to operate the Supermatter engine, consider using these generators in combination with station Solar Arrays. Additional fuel may be obtained from the Logistics department.\n=============================================\r\n " + content: "[color=#1b487e]в–€в–€в–€в–‘в–€в–€в–€в–‘в–‘в–‘в–‘в–€в–€в–‘в–‘в–‘в–‘[/color]\r\n[color=#1b487e]в–‘в–€в–€в–‘в–€в–€в–€в–€в–‘в–‘в–‘в–€в–€в–‘в–‘в–‘в–‘[/color]\r\n[color=#1b487e]в–‘в–‘в–€в–‘в–€в–€в–‘в–€в–€в–‘в–‘в–€в–€в–‘в–€в–‘в–‘[/color] [head=3]NanoTrasen[/head]\r\n[color=#1b487e]в–‘в–‘в–‘в–‘в–€в–€в–‘в–‘в–€в–€в–‘в–€в–€в–‘в–€в–€в–‘[/color] [bold] NTSS-38a Saltern[/bold]\r\n[color=#1b487e]в–‘в–‘в–‘в–‘в–€в–€в–‘в–‘в–‘в–€в–€в–€в–€в–‘в–€в–€в–€[/color]\r\n=============================================\r\n NOTICE TO ENGINEERING STAFF\r\n=============================================\r\nDue to corporate restructuring, and the presence of an updated Mk8 Supermatter engine, we have decided to reduce operational costs on our newest model of \"Saltern\" class stations. This state of the art Supermatter engine costs 450 million Spesos to design, produce, and implement on our stations. We have opted to save on operational costs by not supplying this station with an Antimatter Engine, which we should remind you, costs 150 Million Spesos to produce. \n\nIf you are lacking in qualified and trained engineering personnel to operate the Supermatter engine, consider using these generators in combination with station Solar Arrays. Additional fuel may be obtained from the Logistics department.\n=============================================\r\n " - type: Physics angularDamping: 0 linearDamping: 0 diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index cfaca01ea5a..be2218294e5 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -174204,57 +174204,6 @@ entities: - type: Transform pos: 84.5,40.5 parent: 2 -- proto: LGBTQFlag - entities: - - uid: 755 - components: - - type: Transform - pos: 4.5,24.5 - parent: 2 - - uid: 37541 - components: - - type: Transform - pos: -6.5,-3.5 - parent: 2 - - uid: 37542 - components: - - type: Transform - pos: 4.5,-30.5 - parent: 2 - - uid: 37547 - components: - - type: Transform - pos: 4.5,-49.5 - parent: 2 - - uid: 37548 - components: - - type: Transform - pos: -1.5,-49.5 - parent: 2 -- proto: LGBTQHandyFlag - entities: - - uid: 4080 - components: - - type: Transform - pos: 6.5761847,-34.404533 - parent: 2 - - uid: 37189 - components: - - type: Transform - pos: 13.527647,41.66988 - parent: 2 - - uid: 37546 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.4556704,-33.39672 - parent: 2 - - uid: 37552 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5806704,-33.256096 - parent: 2 - proto: LightBulbBroken entities: - uid: 4609 @@ -217717,28 +217666,6 @@ entities: - type: Transform pos: -56.5,2.5 parent: 2 -- proto: VendingMachinePride - entities: - - uid: 2543 - components: - - type: Transform - pos: 4.5,23.5 - parent: 2 - - uid: 6200 - components: - - type: Transform - pos: -36.5,-23.5 - parent: 2 - - uid: 6382 - components: - - type: Transform - pos: -8.5,18.5 - parent: 2 - - uid: 13070 - components: - - type: Transform - pos: 5.5,-31.5 - parent: 2 - proto: VendingMachineRepDrobe entities: - uid: 9328 diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index a21d85a82a6..a2d77c04338 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -62491,13 +62491,6 @@ entities: rot: 3.141592653589793 rad pos: -38.538452,122.52728 parent: 33 -- proto: ClothingNeckCloakTrans - entities: - - uid: 9288 - components: - - type: Transform - pos: -50.546757,40.480946 - parent: 33 - proto: ClothingNeckHeadphones entities: - uid: 24440 @@ -176116,13 +176109,6 @@ entities: - type: Transform pos: -19.5,42.5 parent: 33 -- proto: VendingMachinePride - entities: - - uid: 27721 - components: - - type: Transform - pos: -16.5,-1.5 - parent: 33 - proto: VendingMachinePwrGame entities: - uid: 2145 diff --git a/Resources/Migrations/WWDPMigration.yml b/Resources/Migrations/WWDPMigration.yml index ad9fb6acb4b..38172a0bb61 100644 --- a/Resources/Migrations/WWDPMigration.yml +++ b/Resources/Migrations/WWDPMigration.yml @@ -1,6 +1,3 @@ -# 2024-11-10 -VendingMachinePride: RandomVending - # 2024-30-10 HoloprojectorEmpty: Holoprojector HoloprojectorBorg: Holoprojector @@ -14,7 +11,6 @@ DresserCaptainFilled: CaptainDrobe # 2024-12-11 NTFlag: FlagNanoTrasen SyndieFlag: FlagSyndicate -LGBTQFlag: RandomPosterLegit # 2025-02-03 BaseBulletRubber: null diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml index 36046aa785c..961cfe89b1d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml @@ -37,26 +37,6 @@ id: LoadoutNeckTieBowTie - type: loadout id: LoadoutNeckTieRibbon - - type: loadout - id: LoadoutItemsPrideLGBTPin - - type: loadout - id: LoadoutItemsPrideAromanticPin - - type: loadout - id: LoadoutItemsPrideAsexualPin - - type: loadout - id: LoadoutItemsPrideBisexualPin - - type: loadout - id: LoadoutItemsPrideGayPin - - type: loadout - id: LoadoutItemsPrideIntersexPin - - type: loadout - id: LoadoutItemsPrideLesbianPin - - type: loadout - id: LoadoutItemsPrideNonBinaryPin - - type: loadout - id: LoadoutItemsPridePansexualPin - - type: loadout - id: LoadoutItemsPrideTransPin - type: loadout id: LoadoutNeckCrucifixColor - type: loadout diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml index 65b07de0c87..8db93f328d2 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml @@ -1,13 +1,3 @@ -- type: cargoProduct - id: CrateVendingMachineRestockPride - icon: - sprite: Objects/Specific/Service/vending_machine_restock.rsi - state: base - product: CrateVendingMachineRestockPrideFilled - cost: 1100 - category: Service - group: market - - type: cargoProduct id: CrateVendingMachineRestockSustenance icon: diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml index 11883c41332..7b80838fecc 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml @@ -1,11 +1,3 @@ -- type: entity - id: CrateVendingMachineRestockPrideFilled - parent: CratePlastic - components: - - type: StorageFill - contents: - - id: VendingMachineRestockPride - - type: entity id: CrateVendingMachineRestockSustenanceFilled parent: CratePlastic diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml deleted file mode 100644 index 6eb6e4fc382..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: vendingMachineInventory - id: PrideDrobeInventory - startingInventory: - ClothingNeckLGBTPin: 3 - ClothingNeckAromanticPin: 3 - ClothingNeckAsexualPin: 3 - ClothingNeckBisexualPin: 3 - ClothingNeckGayPin: 3 - ClothingNeckIntersexPin: 3 - ClothingNeckLesbianPin: 3 - ClothingNeckNonBinaryPin: 3 - ClothingNeckPansexualPin: 3 - ClothingNeckTransPin: 3 - PlushieSharkBlue: 2 - PlushieSharkPink: 2 - PlushieSharkGrey: 2 - ClothingNeckCloakTrans: 2 - ClothingNeckCloakAro: 2 - ClothingNeckCloakAce: 2 - ClothingNeckCloakBi: 2 - ClothingNeckCloakIntersex: 2 - ClothingNeckCloakEnby: 2 - ClothingNeckCloakPan: 2 - ClothingNeckCloakGay: 2 - ClothingNeckCloakLesbian: 2 - ClothingHeadHatXmasCrown: 2 - BedsheetRainbow: 2 - ClothingUniformColorRainbow: 2 - ClothingUnderSocksCoder: 1 - ClothingUnderSocksBee: 1 diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/advertisements.yml index c7fa115ced1..03b4b8506b9 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/advertisements.yml @@ -4,8 +4,3 @@ prefix: advertisement-courierdrobe- count: 5 -- type: localizedDataset - id: PrideDrobeAds - values: - prefix: advertisement-pride- - count: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/goodbyes.yml index 95b41ff92ca..4bd2bb53747 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/goodbyes.yml @@ -4,8 +4,3 @@ prefix: thankyou-courierdrobe- count: 2 -- type: localizedDataset - id: PrideDrobeGoodbyes - values: - prefix: thankyou-pride- - count: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml index 281b590e7e4..3ad74b90587 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -8,22 +8,6 @@ - type: Sprite sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi -- type: entity - parent: BaseVendingMachineRestockDeltaV - id: VendingMachineRestockPride - name: Pride-O-Mat restock box - description: The station needs more plushie sharks and you know it. - components: - - type: VendingMachineRestock - canRestock: - - PrideDrobeInventory - - type: Sprite - layers: - - state: base - - state: green_bit - shader: unshaded - - state: refill_pride - - type: entity parent: BaseVendingMachineRestockDeltaV id: VendingMachineRestockSustenance diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml index 9afbfcdb8a8..16cadd95156 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml @@ -1,30 +1,3 @@ -- type: entity - parent: VendingMachine-NT-Service #AWS-edit - id: VendingMachinePride - name: Pride-O-Mat - description: A vending machine containing crimes. - components: - - type: VendingMachine - pack: PrideDrobeInventory - offState: off - brokenState: broken - normalState: normal-unshaded - - type: Advertise - pack: PrideDrobeAds - - type: SpeakOnUIClosed - pack: PrideDrobeGoodbyes - - type: Speech - - type: Sprite - sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: entity parent: VendingMachine-NT-Cargo #AWS-edit id: VendingMachineCourierDrobe diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 645d8612c44..20012bec538 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -135,15 +135,6 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/miner.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakTrans - name: vampire cloak - description: Worn by high ranking vampires of the transylvanian society of vampires. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/trans.rsi - - type: entity parent: ClothingNeckBase id: ClothingNeckCloakGoliathCloak @@ -200,78 +191,6 @@ - type: TypingIndicatorClothing proto: alien -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakAce - name: pilot's cloak - description: Cloak awarded to Nanotrasen's finest space aces. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/ace.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakAro - name: werewolf cloak - description: This cloak lets others know you're a lone wolf. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/aro.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakBi - name: poison cloak - description: The purple color is a clear indicator you are poisonous. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/bi.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakIntersex - name: cyclops cloak - description: The circle on this cloak represents a cyclops' eye. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/intersex.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakLesbian - name: poet cloak - description: This cloak belonged to an ancient poet, you forgot which one. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/les.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakGay - name: multi-level marketing cloak - description: This cloak is highly sought after in the Nanotrasen Marketing Offices. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/gay.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakEnby - name: treasure hunter cloak - description: This cloak belonged to a greedy treasure hunter. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/enby.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakPan - name: chef's cloak - description: Meant to be worn alongside a frying pan. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/pan.rsi - - type: entity parent: ClothingNeckBase id: ClothingNeckCloakRedHood diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 387b51713fc..740020742a0 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -13,166 +13,6 @@ Blunt: 1 staminaCost: 1 -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLGBTPin - name: LGBT pin - description: Be gay do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: lgbt - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: lgbt-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAromanticPin - name: aromantic pin - description: Be aro do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: aro - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: aro-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAsexualPin - name: asexual pin - description: Be ace do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: asex - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: asex-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckBisexualPin - name: bisexual pin - description: Be bi do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: bi - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: bi-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckGayPin - name: gay pin - description: be gay do crime - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: gay - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: gay-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckIntersexPin - name: intersex pin - description: Be intersex do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: inter - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: inter-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLesbianPin - name: lesbian pin - description: Be lesbian do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: les - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: les-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckNonBinaryPin - name: non-binary pin - description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: non - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: non-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckPansexualPin - name: pansexual pin - description: Be pan do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: pan - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: pan-equipped - -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckTransPin - name: transgender pin - description: Be trans do crime. - components: - - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: trans - - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: trans-equipped - - type: entity parent: ClothingNeckPinBase id: ClothingNeckAutismPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index cce77192460..1658696783d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -99,19 +99,10 @@ # Cloaks - !type:GroupSelector children: - - id: ClothingNeckCloakTrans - id: ClothingNeckCloakAdmin - id: ClothingNeckCloakMoth - id: ClothingNeckCloakVoid - id: ClothingNeckCloakGoliathCloak - - id: ClothingNeckCloakAce - - id: ClothingNeckCloakAro - - id: ClothingNeckCloakBi - - id: ClothingNeckCloakIntersex - - id: ClothingNeckCloakLesbian - - id: ClothingNeckCloakGay - - id: ClothingNeckCloakEnby - - id: ClothingNeckCloakPan - id: ToySkeleton - id: RevolutionaryManifesto - id: Basketball @@ -143,16 +134,6 @@ # Pins - !type:GroupSelector children: - - id: ClothingNeckLGBTPin - - id: ClothingNeckAromanticPin - - id: ClothingNeckAsexualPin - - id: ClothingNeckBisexualPin - - id: ClothingNeckGayPin - - id: ClothingNeckIntersexPin - - id: ClothingNeckLesbianPin - - id: ClothingNeckNonBinaryPin - - id: ClothingNeckPansexualPin - - id: ClothingNeckTransPin - id: ClothingNeckAutismPin - id: ClothingNeckGoldAutismPin # Rare Group diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml index ea7ab6ef4b9..ae223aded9c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml @@ -239,22 +239,3 @@ proto: WatcherBoltMagmawing fireCost: 50 -- type: entity - id: MobWatcherPride - parent: MobWatcherBase - name: pride watcher - suffix: Admeme - description: This rare subspecies only appears in June. - components: - - type: Sprite - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: base - - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] - state: unshaded - shader: unshaded - - type: PointLight - radius: 1.5 - energy: 1 - - type: RgbLightController - layers: [ 1 ] diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 091dd317925..e60f95eada7 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -204,8 +204,6 @@ orGroup: GiftPool - id: ViolaInstrument orGroup: GiftPool - - id: ClothingNeckCloakTrans - orGroup: GiftPool - id: ClothingNeckCloakAdmin orGroup: GiftPool - id: ToySkeleton diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 6df1a39dc8c..eee0ac2bcc4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -34,18 +34,6 @@ - type: Item sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi -- type: entity - parent: BaseItem - id: LGBTQHandyFlag - name: LGBTQ handheld flag - description: "The be gay do crime handy flag." - components: - - type: Sprite - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - state: icon - - type: Item - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - - type: entity parent: BaseItem id: PirateHandyFlag diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 155d0426059..707ca004560 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -54,9 +54,6 @@ components: - type: StorageFill contents: - - id: ClothingNeckLGBTPin - prob: 0.06 - orGroup: dressermainloot - id: ClothingUniformJumpsuitColorGrey prob: 0.06 orGroup: dressermainloot diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index 992f7a71e6f..63008941103 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -36,15 +36,6 @@ - type: Sprite state: syndie_flag -- type: entity - parent: BaseFlag - id: LGBTQFlag - name: LGBTQ flag - description: "\"Be gay do crime\" flag." - components: - - type: Sprite - state: lgbtq_flag - - type: entity parent: BaseFlag id: PirateFlag @@ -52,4 +43,4 @@ description: Raise the jolly roger, scallywags! components: - type: Sprite - state: pirate_flag \ No newline at end of file + state: pirate_flag diff --git a/Resources/Prototypes/Loadouts/Generic/neck.yml b/Resources/Prototypes/Loadouts/Generic/neck.yml index 3cf792f6051..b77b06e1062 100644 --- a/Resources/Prototypes/Loadouts/Generic/neck.yml +++ b/Resources/Prototypes/Loadouts/Generic/neck.yml @@ -238,127 +238,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck -#Pride Accessories -- type: loadout - id: LoadoutItemsPrideLGBTPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckLGBTPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideAromanticPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckAromanticPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideAsexualPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckAsexualPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideBisexualPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckBisexualPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideGayPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckGayPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideIntersexPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckIntersexPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideLesbianPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckLesbianPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideNonBinaryPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckNonBinaryPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPridePansexualPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckPansexualPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutItemsPrideTransPin - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTransPin - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - # Religious - type: loadout id: LoadoutNeckCrucifixColor @@ -673,4 +552,4 @@ - ClothingNeckNecklacePendantSilverLarge requirements: - !type:CharacterItemGroupRequirement - group: LoadoutNeck \ No newline at end of file + group: LoadoutNeck diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml index 4f22019c200..3f97668642f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml @@ -143,9 +143,6 @@ - MobWatcherLavaland - MobWatcherIcewing - MobWatcherMagmawing - rarePrototypes: - - MobWatcherPride - rareChance: 0.10 - type: entity name: Space Creature Spawner diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml index 9ef2331aa93..0bd69b1809f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml @@ -131,7 +131,6 @@ - CandleGreen - CandlePurple - BlankHandyFlag - - LGBTQHandyFlag - PirateHandyFlag - Fork - Spoon diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index e779963bf55..a8250d4d82b 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -193,12 +193,6 @@ beginDay: 21 beginMonth: June -- type: holiday - id: StonewallRiotsAnniversary - name: holiday-name-stonewall-riots-anniversary - beginDay: 28 - beginMonth: June - - type: holiday id: DoctorDay name: holiday-name-doctor-day @@ -265,12 +259,6 @@ !type:DayOfYear dayOfYear: 256 -- type: holiday - id: BisexualPrideDay - name: holiday-name-bisexual-pride-day - beginDay: 23 - beginMonth: September - - type: holiday id: StupidQuestionsDay name: holiday-name-stupid-questions-day @@ -289,18 +277,6 @@ beginDay: 7 beginMonth: October -- type: holiday - id: LesbianDay - name: holiday-name-lesbian-day - beginDay: 8 - beginMonth: October - -- type: holiday - id: NationalComingOutDay - name: holiday-name-national-coming-out-day - beginDay: 11 - beginMonth: October - - type: holiday id: CanadianThanksgiving name: holiday-name-canadian-thanksgiving @@ -310,15 +286,6 @@ occurrence: 2 weekday: Monday -- type: holiday - id: SpiritDay - name: holiday-name-spirit-day - beginMonth: October - shouldCelebrate: - !type:WeekdayInMonth - occurrence: 3 - weekday: Thursday - - type: holiday id: Halloween name: holiday-name-halloween @@ -361,12 +328,6 @@ beginDay: 19 beginMonth: November -- type: holiday - id: TransgenderRemembranceDay - name: holiday-name-transgender-remembrance-day - beginDay: 20 - beginMonth: November - - type: holiday id: SayingHelloDay name: holiday-name-saying-hello-day diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png deleted file mode 100644 index 1bf0eeba71e..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png deleted file mode 100644 index b81ad3dddbb..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-left.png deleted file mode 100644 index 8e9262ebe50..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-right.png deleted file mode 100644 index 0afc28354bb..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png deleted file mode 100644 index 80a27e48f6f..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png deleted file mode 100644 index 0426a309456..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-left.png deleted file mode 100644 index 4ae5b32ca73..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-right.png deleted file mode 100644 index 0b3e4a449b7..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png deleted file mode 100644 index 77e9c2bd4d2..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png deleted file mode 100644 index 51353910da5..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-left.png deleted file mode 100644 index 5120f12fe08..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-right.png deleted file mode 100644 index 45e37590e94..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png deleted file mode 100644 index 6983acd0362..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png deleted file mode 100644 index 191de8786a1..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-left.png deleted file mode 100644 index 0af2224c981..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-right.png deleted file mode 100644 index f2e559d39e8..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png deleted file mode 100644 index cf6c7acdac8..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png deleted file mode 100644 index 3e864b37be3..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-left.png deleted file mode 100644 index e33174ce168..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-right.png deleted file mode 100644 index 093cc7d3544..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png deleted file mode 100644 index 30334415f16..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png deleted file mode 100644 index 2c1054e46ac..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-left.png deleted file mode 100644 index 87950380b98..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-right.png deleted file mode 100644 index a4e67b62723..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png deleted file mode 100644 index 257de321210..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png deleted file mode 100644 index 35185542302..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-left.png deleted file mode 100644 index 027e894f866..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-right.png deleted file mode 100644 index 1ee297ba14d..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png deleted file mode 100644 index db81ed15eef..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png deleted file mode 100644 index 1bac95d0e43..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-left.png deleted file mode 100644 index f31dc5d0572..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-right.png deleted file mode 100644 index e569cec99f2..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/meta.json deleted file mode 100644 index b29eb9f3704..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by superfreak9111 on discord for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png deleted file mode 100644 index a71e8ae3a9a..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png deleted file mode 100644 index 6aeeeff7551..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png deleted file mode 100644 index 3b176391baf..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png deleted file mode 100644 index 13fdf2845d9..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/meta.json deleted file mode 100644 index 81912370c56..00000000000 --- a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Shiptest at https://github.com/shiptest-ss13/Shiptest/commit/0116c3dc37bece6ed865daf22bb7be4ac630d081, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png deleted file mode 100644 index ce50d896bcc..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png deleted file mode 100644 index 8cf2346e586..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png deleted file mode 100644 index 1d74f67b20e..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png deleted file mode 100644 index 7df1114ffed..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png deleted file mode 100644 index cb9e1dd8bdf..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png deleted file mode 100644 index d6d32b8bbb1..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png deleted file mode 100644 index e6e4ed0536f..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png deleted file mode 100644 index 580d390fce9..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png deleted file mode 100644 index d72f516ec23..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png deleted file mode 100644 index c191729a242..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png deleted file mode 100644 index 3f826656bfa..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png deleted file mode 100644 index 816f2bd3f44..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png deleted file mode 100644 index 1bdd3de51e3..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png deleted file mode 100644 index 8d48afe4488..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json deleted file mode 100644 index ce23c963cd0..00000000000 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, gay-equipped modified by Skubman", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "aro" - }, - { - "name": "aro-equipped", - "directions": 4 - }, - { - "name": "asex" - }, - { - "name": "asex-equipped", - "directions": 4 - }, - { - "name": "bi" - }, - { - "name": "bi-equipped", - "directions": 4 - }, - { - "name": "gay" - }, - { - "name": "gay-equipped", - "directions": 4 - }, - { - "name": "inter" - }, - { - "name": "inter-equipped", - "directions": 4 - }, - { - "name": "les" - }, - { - "name": "les-equipped", - "directions": 4 - }, - { - "name": "lgbt" - }, - { - "name": "lgbt-equipped", - "directions": 4 - }, - { - "name": "non" - }, - { - "name": "non-equipped", - "directions": 4 - }, - { - "name": "pan" - }, - { - "name": "pan-equipped", - "directions": 4 - }, - { - "name": "trans" - }, - { - "name": "trans-equipped", - "directions": 4 - } - ] -} - diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png deleted file mode 100644 index 7774132a4dc..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png deleted file mode 100644 index 9346d5fa6af..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png deleted file mode 100644 index bdd61cbd830..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png deleted file mode 100644 index b74d31e792f..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png deleted file mode 100644 index 500797c103d..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png deleted file mode 100644 index a47420daa64..00000000000 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index caefa7f4992..c81642706fa 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -21,9 +21,6 @@ { "name": "green_bit" }, - { - "name": "refill_pride" - }, { "name": "refill_sustenance" } diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png deleted file mode 100644 index f31c671e49f..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png deleted file mode 100644 index b506b41a543..00000000000 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json deleted file mode 100644 index cef421923bf..00000000000 --- a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "The art belongs to Woods#1999 on discord", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken" - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 1.5, - 0.1, - 1.5, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png deleted file mode 100644 index 4bea61c2abb..00000000000 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png deleted file mode 100644 index 4e1dc9af28d..00000000000 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png deleted file mode 100644 index 0032751ff4f..00000000000 Binary files a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png deleted file mode 100644 index ff4e3eb2cf6..00000000000 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png deleted file mode 100644 index 63005e54161..00000000000 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png deleted file mode 100644 index fbdf7c7e77f..00000000000 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json deleted file mode 100644 index 7fc21e61ab4..00000000000 --- a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Saveliy360", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png deleted file mode 100644 index 36237bb4599..00000000000 Binary files a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json index 36d69f0e428..ced7cad70dc 100644 --- a/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json @@ -16,9 +16,6 @@ { "name": "syndie_flag" }, - { - "name": "lgbtq_flag" - }, { "name": "pirate_flag" }