Fix upstream

space-syndicate · Dec 5, 2024 · e5ea431 · e5ea431
1 parent 214b315
commit e5ea431
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/decoration/present.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/decoration/present.ftl
@@ -15,9 +15,6 @@ ent-PresentRandom = { ent-PresentBase }
 ent-PresentRandomCoal = { ent-PresentBase }
     .suffix = Filled Coal
     .desc = { ent-PresentBase.desc }
-ent-PresentRandomAsh = { ent-PresentBase }
-    .suffix = Заполненный, Пепел
-    .desc = { ent-PresentBase.desc }
 ent-PresentRandomCash = { ent-PresentBase }
     .suffix = Заполненный, Деньги
     .desc = { ent-PresentBase.desc }

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/flora.yml
@@ -61,7 +61,7 @@
       - id: PresentRandomCash
         prob: 0.20
         orGroup: present
-      - id: PresentRandomAsh
+      - id: PresentRandomCoal
         prob: 0.05
         orGroup: present
     receivedPopup: christmas-tree-got-gift

diff --git a/Resources/Prototypes/Maps/amber.yml b/Resources/Prototypes/Maps/amber.yml
@@ -19,6 +19,7 @@
           availableJobs:
             #service
             Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
             Botanist: [ 2, 2 ]
@@ -50,7 +51,7 @@
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ] # Corvax-IAA
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 3 ]