Merge pull request #140 from MrLopLop/up02012025

Up02012025
Corvax-Frontier · Jan 1, 2025 · e842d54 · e842d54
2 parents d1f6aaf + 1ccd024
commit e842d54
Show file tree

Hide file tree

Showing 64 changed files with 1,237 additions and 120 deletions.
diff --git a/Resources/Audio/_Nuclear14/Effects/attributions.yml b/Resources/Audio/_Nuclear14/Effects/attributions.yml
@@ -1,4 +1,9 @@
 - files: ["UI_Pipboy_Radio_On.ogg", "UI_Quest_Update.ogg", "UI_QuestNew.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Bethesda Softworks, from fallout 4. Converted from WAV to OGG. License unconfirmed Fair use?"
-  source: "https://www.youtube.com/watch?v=xTvducynPKQ"
+  source: "https://www.youtube.com/watch?v=xTvducynPKQ"
+
+- files: ["open_gift.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Taken from zvukipro.com . Converted from mp3 to OGG Mr_Lop_Lop. Custom license."
+  source: "https://zvukipro.com/predmet/1308-zvuki-podarka.html"
diff --git a/Resources/Audio/_Nuclear14/Effects/open_gift.ogg b/Resources/Audio/_Nuclear14/Effects/open_gift.ogg
diff --git a/Resources/Audio/_Nuclear14/Lobby/Frank-Sinatra-Jingle-Bells.ogg b/Resources/Audio/_Nuclear14/Lobby/Frank-Sinatra-Jingle-Bells.ogg
diff --git a/Resources/Audio/_Nuclear14/Lobby/attributions.yml b/Resources/Audio/_Nuclear14/Lobby/attributions.yml
@@ -14,3 +14,8 @@
   license: "CC-BY-NC-SA-4.0"
   copyright: "Copyright owned by respective artists, see source link for details."
   source: "https://fallout.fandom.com/wiki/Fallout:_New_Vegas_soundtrack" 
+
+- files: ["Frank-Sinatra-Jingle-Bells.ogg"]
+  license: "Custom"
+  copyright: "Copyright owned by respective artists, see source link for details."
+  source: "https://www.youtube.com/watch?v=hLf0-lro8X8" 
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/catalog/fills/crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/catalog/fills/crates.ftl
@@ -32,3 +32,9 @@ ent-N14CrateBreakPlainFilledLeadBar = ящик со свинцовыми сли
     .desc = Ящик, содержащий 20 слитков свинца.
 ent-N14CrateBreakPlainFilledAbraxo = ящик с чистящими средствами Абраксо
     .desc = Ящик, содержащий 4 очистителя Абраксо.
+ent-N14CrateBreakPlainFilledRadaway = ящик с атрирадом
+    .desc = Ящик, содержащий 6 пакетов антирада
+ent-N14CrateBreakPlainFilledOintment = ящик мази от ожогов
+    .desc = Ящик, содержащий 6 тюбиков мази от ожогов
+ent-N14CrateBreakPlainFilledAntidote = ящик с атидотами
+    .desc = Ящик, содержащий 2 бутылки антидота
diff --git a/...urces/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/new_years_gift.ftl b/...urces/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/new_years_gift.ftl
@@ -0,0 +1,16 @@
+ent-N14NewYearsGift = новогодний подарок
+    .desc = С Новым Годом!!!
+ent-N14NewYearsGift1 = { ent-N14NewYearsGift }
+    .desc = { ent-N14NewYearsGift.desc }
+ent-N14NewYearsGift2 = { ent-N14NewYearsGift1 }
+    .desc = { ent-N14NewYearsGift1.desc }
+ent-N14JunkLunchboxFill = { ent-N14JunkLunchbox }
+    .desc = { ent-N14JunkLunchbox.desc }
+ent-N14GiftFillDrinks = подарок
+    .desc = Интересно что там внутри?
+ent-N14GiftFillMedical = { ent-N14GiftFillDrinks }
+    .desc = { ent-N14GiftFillDrinks.desc }
+ent-N14GiftFillArmor = { ent-N14GiftFillDrinks }
+    .desc = { ent-N14GiftFillDrinks.desc }
+ent-N14GiftFillWeapon = { ent-N14GiftFillDrinks }
+    .desc = { ent-N14GiftFillDrinks.desc }
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -8,7 +8,7 @@
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
   - type: StaticPrice
-    price: 50
+    price: 5
   - type: SolutionContainerManager
     solutions:
       food:

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -58,7 +58,7 @@
                   min: 2
                   max: 2
     - type: StaticPrice
-      price: 50
+      price: 5
 
 #Security Shields
 
@@ -169,7 +169,7 @@
                   min: 5
                   max: 5
     - type: StaticPrice
-      price: 150
+      price: 5
 
 - type: entity
   name: makeshift shield

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -88,7 +88,7 @@
       types:
         Blunt: 5
   - type: StaticPrice
-    price: 30
+    price: 3
 
 - type: entity
   parent: BaseItem
@@ -146,7 +146,7 @@
     damageContainer: Inorganic
     damageModifierSet: Glass
   - type: StaticPrice
-    price: 30
+    price: 3
 
 - type: entity
   name: beaker
@@ -157,7 +157,7 @@
   - type: Spillable
     solution: beaker
   - type: StaticPrice
-    price: 10
+    price: 1
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: beaker
@@ -208,7 +208,7 @@
     inHandsMaxFillLevels: 4
     inHandsFillBaseName: -fill-
   - type: StaticPrice
-    price: 20
+    price: 2
 
 - type: entity
   name: cryostasis beaker
@@ -295,7 +295,7 @@
     inHandsMaxFillLevels: 1
     inHandsFillBaseName: -fill-
   - type: StaticPrice
-    price: 40
+    price: 2
 
 - type: entity
   name: borgdropper

diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -103,7 +103,7 @@
     materialComposition:
       Steel: 200
   - type: StaticPrice
-    price: 40
+    price: 4
   - type: IgnitionSource
     temperature: 700
   - type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -47,7 +47,7 @@
         sound:
           collection: MetalBreak
   - type: StaticPrice
-    price: 10
+    price: 0
 
 #Starts unanchored, cannot be rotated while anchored
 - type: entity
@@ -229,7 +229,7 @@
     tags:
     - Wooden
   - type: StaticPrice
-    price: 75
+    price: 0
 
 - type: entity
   name: ritual chair
@@ -398,4 +398,4 @@
             min: 2
             max: 4
   - type: StaticPrice
-    price: 20
+    price: 0
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
@@ -592,7 +592,7 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 0.6 # Makes it 20 damage per unit.
+            Poison: 0.06 # Makes it 2 damage per unit.
 
 - type: reagent
   id: Bungotoxin

diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -86,9 +86,9 @@
   id: Licoxide
   reactants:
     Lead:
-      amount: 1
+      amount: 10
     Zinc:
-      amount: 1
+      amount: 10
   products:
     Licoxide: 1
 

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml
@@ -14,7 +14,7 @@
     sprite: Objects/Consumable/Drinks/waterbottle.rsi
     state: icon
   product: N14CrateBreakPlainFilledWatterBottle
-  cost: 200
+  cost: 120
   category: Consumables
   group: market
 
@@ -24,7 +24,7 @@
     sprite: _Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi
     state: closed
   product: N14CrateBreakPlainFilledCigarettesRepublic
-  cost: 50
+  cost: 220
   category: Consumables
   group: market
 

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml
@@ -4,7 +4,7 @@
     sprite: _Nuclear14/Mobs/Animals/brahmin.rsi
     state: brahmin-2
   product: N14MobBrahmin
-  cost: 80
+  cost: 100
   category: Livestock
   group: market
 
@@ -14,6 +14,6 @@
     sprite: _Nuclear14/Mobs/Animals/chicken.rsi
     state: chicken
   product: N14MobChicken
-  cost: 30
+  cost: 80
   category: Livestock
-  group: market
+  group: market
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml
@@ -4,7 +4,7 @@
     sprite: /Textures/Objects/Materials/Sheets/metal.rsi
     state: steel
   product: N14CrateBreakPlainFilledSteelSheet
-  cost: 60
+  cost: 120
   category: Materials
   group: market
 
@@ -14,7 +14,7 @@
     sprite: /Textures/Objects/Materials/Sheets/other.rsi
     state: plastic
   product: N14CrateBreakPlainFilledPlasticSheet
-  cost: 60
+  cost: 100
   category: Materials
   group: market
 
@@ -24,7 +24,7 @@
     sprite: /Textures/Objects/Materials/Sheets/glass.rsi
     state: glass
   product: N14CrateBreakPlainFilledGlassSheet
-  cost: 60
+  cost: 120
   category: Materials
   group: market
 
@@ -34,7 +34,7 @@
     sprite: /Textures/Objects/Materials/materials.rsi
     state: wood
   product: N14CrateBreakPlainFilledWood
-  cost: 20
+  cost: 100
   category: Materials
   group: market
 
@@ -54,7 +54,7 @@
     sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi
     state: ingot_lead
   product: N14CrateBreakPlainFilledLeadBar
-  cost: 160
+  cost: 175
   category: Materials
   group: market
 
@@ -76,4 +76,4 @@
   product: N14CrateBreakPlainFilledMechanicParts
   cost: 60
   category: Materials
-  group: market
+  group: market
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml
@@ -6,4 +6,34 @@
   product: N14CrateBreakPlainFilledStimpak
   cost: 300
   category: Medical / Aid
-  group: market
+  group: market
+
+- type: cargoProduct
+  id: RadawayCrate
+  icon:
+    sprite: _Nuclear14/Objects/Specific/Medical/bloodbags.rsi
+    state: radaway
+  product: N14CrateBreakPlainFilledRadaway
+  cost: 250
+  category: Medical / Aid
+  group: market
+
+- type: cargoProduct
+  id: AntidoteCrate
+  icon:
+    sprite: _Nuclear14/Objects/Specific/Medical/fallout2.rsi
+    state: antidote
+  product: N14CrateBreakPlainFilledAntidote
+  cost: 200
+  category: Medical / Aid
+  group: market
+
+- type: cargoProduct
+  id: OintmentCrate
+  icon:
+    sprite: Objects/Specific/Medical/medical.rsi
+    state: ointment
+  product: N14CrateBreakPlainFilledOintment
+  cost: 250
+  category: Medical / Aid
+  group: market