Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Remove] No more pride #1027

Merged
merged 8 commits into from
Feb 9, 2025
+576 −613
Merged

[Remove] No more pride #1027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
80a1cdf
No more pride!!!!!!
Roudenn Feb 6, 2025
a11944e
actually no gay
Roudenn Feb 8, 2025
4b92e97
Update maintenance.yml
Roudenn Feb 8, 2025
d8af230
Update migration.yml
Roudenn Feb 9, 2025
5cfffc1
Delete transilvania and fix Avrite
Roudenn Feb 9, 2025
bccce7b
Update migration.yml
Roudenn Feb 9, 2025
fbe7ab0
Update corvax_avrite.yml
Roudenn Feb 9, 2025
3a22119
Update corvax_avrite.yml
Roudenn Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
weight: 40
- id: VendingMachineWinter
weight: 40
- id: VendingMachinePride
weight: 10
#- id: VendingMachinePride # backmen: remove pride
# weight: 10
- id: VendingMachineTheater
weight: 10

Expand Down
24 changes: 13 additions & 11 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,19 @@
- CigPackBlack
- CigarCase
- CigarGold
- ClothingNeckLGBTPin
- ClothingNeckAromanticPin
- ClothingNeckAsexualPin
- ClothingNeckBisexualPin
- ClothingNeckGayPin
- ClothingNeckIntersexPin
- ClothingNeckLesbianPin
- ClothingNeckNonBinaryPin
- ClothingNeckPansexualPin
- ClothingNeckOmnisexualPin
- ClothingNeckTransPin
# start-backmen: no pride
# - ClothingNeckLGBTPin
# - ClothingNeckAromanticPin
# - ClothingNeckAsexualPin
# - ClothingNeckBisexualPin
# - ClothingNeckGayPin
# - ClothingNeckIntersexPin
# - ClothingNeckLesbianPin
# - ClothingNeckNonBinaryPin
# - ClothingNeckPansexualPin
# - ClothingNeckOmnisexualPin
# - ClothingNeckTransPin
# end-backmen: no pride
- ClothingNeckAutismPin
- ClothingNeckGoldAutismPin
# backmen-pins-start
Expand Down
32 changes: 16 additions & 16 deletions Resources/Prototypes/holidays.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@
!type:DayOfYear
dayOfYear: 256

- type: holiday
id: BisexualPrideDay
name: holiday-name-bisexual-pride-day
beginDay: 23
beginMonth: September
#- type: holiday # backmen: no pride
# id: BisexualPrideDay
# name: holiday-name-bisexual-pride-day
# beginDay: 23
# beginMonth: September

- type: holiday
id: StupidQuestionsDay
Expand All @@ -289,11 +289,11 @@
beginDay: 7
beginMonth: October

- type: holiday
id: LesbianDay
name: holiday-name-lesbian-day
beginDay: 8
beginMonth: October
#- type: holiday # backmen: no pride
# id: LesbianDay
# name: holiday-name-lesbian-day
# beginDay: 8
# beginMonth: October

- type: holiday
id: NationalComingOutDay
Expand Down Expand Up @@ -438,9 +438,9 @@
shouldCelebrate:
!type:FridayThirteenth { }

- type: holiday
id: PrideMonth
name: holiday-name-pride-month
beginDay: 1
endDay: 31
beginMonth: June
#- type: holiday # backmen: no pride
# id: PrideMonth
# name: holiday-name-pride-month
# beginDay: 1
# endDay: 31
# beginMonth: June
27 changes: 27 additions & 0 deletions Resources/migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,3 +731,30 @@ FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce
#WeaponSubMachineGunVectorRubber: null
MagazineBoxCaselessRifleBig: MagazineBoxCaselessRifle
MagazineBoxAntiMaterielBig: MagazineBoxAntiMateriel

#2025-02-06 backmen: no pride
LGBTQFlag: null
LGBTQHandyFlag: null
ClothingNeckLGBTPin: null
ClothingNeckAromanticPin: null
ClothingNeckAsexualPin: null
ClothingNeckBisexualPin: null
ClothingNeckGayPin: null
ClothingNeckIntersexPin: null
ClothingNeckLesbianPin: null
ClothingNeckNonBinaryPin: null
ClothingNeckNonBinaryPin: null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Критическая ошибка: Дублирование ключа "ClothingNeckNonBinaryPin"
Обнаружено повторение ключа ClothingNeckNonBinaryPin на строках 745 и 746. Это может привести к конфликтам при парсинге YAML. Рекомендуется удалить один из дублирующихся ключей.

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 746-746: duplication of key "ClothingNeckNonBinaryPin" in mapping

(key-duplicates)

ClothingNeckPansexualPin: null
ClothingNeckOmnisexualPin: null
ClothingNeckTransPin: null
ClothingNeckScarfStripedAce: null
ClothingNeckScarfStripedAro: null
ClothingNeckScarfStripedBiSexual: null
ClothingNeckScarfStripedGay: null
ClothingNeckScarfStripedInter: null
ClothingNeckScarfStripedLesbian: null
ClothingNeckScarfStripedPan: null
ClothingNeckScarfStripedNonBinary: null
ClothingNeckScarfStripedRainbow: null
ClothingNeckScarfStripedTrans: null
VendingMachinePride: null
Loading