Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

This commit is contained in:
Heidesommer 2026-05-25 21:14:42 -04:00
commit 030862fe37
9 changed files with 227 additions and 142 deletions

View file

@ -1639,24 +1639,12 @@ d_stavropul={
color1=green_light
color2=blue_light
color3=red
colored_emblem={
color1=blue_light
color2=blue
texture="ce_per_fess.dds"
instance={
position={ 0.500000 0.385000 }
scale={ 0.090000 0.090000 }
depth=2.010000
}
}
colored_emblem={
color1=white
texture="ce_ordinary_pile_03_inverted.dds"
instance={
position={ 0.500000 0.365000 }
scale={ 0.080000 0.040000 }
scale={ 0.135000 0.055000 }
}
}
@ -1665,8 +1653,8 @@ d_stavropul={
color1=yellow
texture="ce_circle_mask.dds"
instance={
position={ 0.500000 0.415000 }
scale={ 0.035000 0.035000 }
position={ 0.500000 0.430000 }
scale={ 0.055000 0.055000 }
depth=1.010000
}
@ -1682,12 +1670,24 @@ d_stavropul={
}
colored_emblem={
color1=blue_light
color2=blue
texture="ce_chief.dds"
instance={
position={ 0.500000 0.375000 }
scale={ 0.120000 -0.085000 }
depth=2.010000
}
}
colored_emblem={
color1=blue
texture="ce_shield_01.dds"
instance={
position={ 0.500000 0.425000 }
scale={ 0.100000 0.040000 }
scale={ 0.150000 0.150000 }
depth=3.010000
}
@ -1705,6 +1705,84 @@ d_stavropul={
}
d_terek = {
pattern="pattern_horizontal_split_01.dds"
color1=black
color2=yellow_light
color3=blue
colored_emblem={
color1=white
texture="ce_fess_engrailed.dds"
instance={
position={ 0.905000 0.095000 }
depth=3.010000
rotation=135
}
instance={
position={ 0.250000 0.750000 }
depth=4.010000
rotation=135
}
}
colored_emblem={
color1=black
color2=yellow
color3=black
texture="NEOW_ce_eagle_russia.dds"
instance={
position={ 0.325000 0.295000 }
scale={ 0.200000 0.200000 }
rotation=315
}
}
colored_emblem={
color1=yellow
texture="ce_block_05.dds"
instance={
position={ 0.375000 0.545000 }
scale={ 0.650000 0.650000 }
depth=5.010000
rotation=45
}
}
colored_emblem={
color1=yellow
texture="ce_block_02.dds"
instance={
position={ 0.305000 0.315000 }
scale={ 0.220000 0.220000 }
depth=1.010000
rotation=135
}
instance={
position={ 0.350000 0.270000 }
scale={ 0.220000 0.220000 }
depth=2.010000
rotation=135
}
}
colored_emblem={
color1=black
texture="ce_block_02.dds"
instance={
depth=6.010000
}
}
}
d_vainakhia={
pattern="pattern_tricolor_horizontal_01.dds"
color1=green

View file

@ -2636,25 +2636,10 @@ e_nistrenia = {
province = 8849
color = { 28 38 45 }
}
}
c_samiran = {
color = { 141 51 30 }
b_samiran = {
province = 5343
color = { 141 51 30 }
}
b_cabartei = {
province = 5308
color = { 141 51 30 }
}
}
}
}
d_stavropul = {
color = { 34 5 0 }
capital = c_stavropul
d_terek = {
color = { 160 50 5 }
c_anket = {
color = { 160 50 5 }
b_petigoria = {
@ -2673,6 +2658,31 @@ e_nistrenia = {
color = { 160 50 5 }
}
}
c_mozdog = { # Mozdog
color = { 7 2 87 }
b_mozdog = { # Mozdog
province = 8855
color = { 7 2 87 }
}
b_prokhladny = { # Prokhladny
province = 8870
color = { 8 3 95 }
}
}
c_samiran = {
color = { 141 51 30 }
b_samiran = {
province = 5343
color = { 141 51 30 }
}
b_cabartei = {
province = 5308
color = { 141 51 30 }
}
}
c_besinada = {
color = { 34 5 0 }
@ -2686,68 +2696,8 @@ e_nistrenia = {
color = { 34 5 0 }
}
}
c_turkmensky = {
color = { 200 40 50 }
b_turkmensky = { # Mozdog
province = 12377
color = { 200 40 50 }
}
b_blagodarnesky = {
province = 12381
color = { 170 20 40 }
}
}
c_levokumsky = {
color = { 170 20 40 }
b_arzgir = {
province = 12382
color = { 170 20 40 }
}
b_levokumskoye = {
province = 12379
color = { 170 20 40 }
}
}
c_stavropul = {
color = { 80 10 40 }
b_stavropul = {
province = 12378
color = { 80 10 40 }
}
b_novoalexandrovsky = {
province = 12380
color ={ 80 10 40 }
}
b_etzeri = {
province = 5300
color = { 85 50 22 }
}
}
c_mozdog = { # Mozdog
color = { 7 2 87 }
b_mozdog = { # Mozdog
province = 8855
color = { 7 2 87 }
}
b_prokhladny = { # Prokhladny
province = 8870
color = { 8 3 95 }
}
}
c_ipatovsky = {
color = { 200 40 100 }
b_ipatovsky = {
province = 12376
color = { 200 40 100 }
}
b_apanasenkovsky = {
province = 12375
color = { 200 40 100 }
}
}
}
}
}
d_vainakhia = { # Vainakhia
color = { 5 8 120 }
capital = c_grozny # Grozny
@ -2763,15 +2713,19 @@ e_nistrenia = {
province = 8851
color = { 2 1 113 }
}
}
c_naurskaya = { # Grozny
color = { 141 51 30 }
b_naurskaya = { # Naurskaya
province = 8852
color = { 2 1 113 }
}
b_samander = { # Shelkovskaya
province = 5307
color = { 141 51 30 }
}
b_naurskaya = { # Naurskaya
province = 8852
color = { 2 1 113 }
}
}
}
c_urus_martan = { # Urus-Martan
color = { 8 4 134 }
@ -2877,6 +2831,11 @@ e_nistrenia = {
province = 8862
color = { 9 9 131 }
}
b_etzeri = {
province = 5300
color = { 85 50 22 }
}
}
c_elbrus = { # Elbrus
color = { 4 5 135 }
@ -3034,7 +2993,54 @@ e_nistrenia = {
}
}
}
d_stavropul = {
color = { 34 5 0 }
capital = c_stavropul
c_turkmensky = {
color = { 200 40 50 }
b_turkmensky = { # Mozdog
province = 12377
color = { 200 40 50 }
}
b_blagodarnesky = {
province = 12381
color = { 170 20 40 }
}
}
c_levokumsky = {
color = { 170 20 40 }
b_arzgir = {
province = 12382
color = { 170 20 40 }
}
b_levokumskoye = {
province = 12379
color = { 170 20 40 }
}
}
c_stavropul = {
color = { 80 10 40 }
b_stavropul = {
province = 12378
color = { 80 10 40 }
}
b_novoalexandrovsky = {
province = 12380
color ={ 80 10 40 }
}
}
c_ipatovsky = {
color = { 200 40 100 }
b_ipatovsky = {
province = 12376
color = { 200 40 100 }
}
b_apanasenkovsky = {
province = 12375
color = { 200 40 100 }
}
}
}
d_volgograd = {
color = { 143 92 21 }
@ -3220,7 +3226,7 @@ e_nistrenia = {
}
d_krasnodar = { # Krasnodar
color = { 111 45 80 }
capital = c_krasnodar
capital = c_rostov_on_don
c_krasnodar = { # Krasnodar
color = { 98 57 73 }

View file

@ -141,7 +141,36 @@ e_volga-ural = {
}
}
}
d_chuvashia = {
color = { 26 46 50 }
capital = c_cheboksary
c_cheboksary = {
color = { 44 44 65 }
b_cheboksary = {
province = 590
color = { 44 44 65 }
}
b_urmary = {
province = 5363
color = { 44 44 65 }
}
b_tzyvil = {
province = 5364
color = { 44 44 65 }
}
b_alatyr = {
province = 5365
color = { 44 44 65 }
}
}
}
d_ulyanovsk = {
color = { 87 66 55 }
@ -1493,36 +1522,6 @@ e_volga-ural = {
}
}
}
d_chuvashia = {
color = { 26 46 50 }
capital = c_cheboksary
c_cheboksary = {
color = { 44 44 65 }
b_cheboksary = {
province = 590
color = { 44 44 65 }
}
b_urmary = {
province = 5363
color = { 44 44 65 }
}
b_tzyvil = {
province = 5364
color = { 44 44 65 }
}
b_alatyr = {
province = 5365
color = { 44 44 65 }
}
}
}
d_mordvinia = {
color = { 0 25 15 }

View file

@ -467,7 +467,7 @@ finnic_religion = { #placeholder
#Special Tolerance
#Tenets
doctrine = tenet_inner_journey
doctrine = tenet_asceticism
doctrine = tenet_no_mind
doctrine = tenet_militant_vows
doctrine = doctrine_homosexuality_accepted

View file

@ -271,6 +271,7 @@ slavic_religion = { #placeholder
doctrine = doctrine_funeral_bewailment # Keening
doctrine = doctrine_witchcraft_criminal
doctrine = doctrine_clerical_gender_male_only
doctrine = doctrine_theocracy_temporal
holy_order_names = {
{ name = "holy_order_brotherhood_of_the_holy_sepulchre" }