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

New Year's update #759

Merged
merged 3 commits into from
Dec 24, 2024
Merged

New Year's update #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af96927
gifts
MrLopLop Dec 21, 2024
c23e0c1
Merge branch 'master' of https://github.com/Vault-Overseers/nuclear-1…
MrLopLop Dec 22, 2024
da60d52
deleting map changes
MrLopLop Dec 24, 2024
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
7 changes: 6 additions & 1 deletion Resources/Audio/_Nuclear14/Effects/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Audio/_Nuclear14/Effects/open_gift.ogg
View file
Open in desktop
Binary file not shown.
182 changes: 181 additions & 1 deletion Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledWastelander
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -16,6 +25,15 @@
contents:
- id: N14BoxPlasticFilledWastelander
- id: Bible
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -27,6 +45,15 @@
- id: N14BoxPlasticFilledWastelander
- id: AcousticGuitarInstrument
- id: SaxophoneInstrument
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Caravan
- type: entity
Expand All @@ -41,6 +68,15 @@
- id: Magazine556Rifle
- id: N14MagazinePistol10mm
- id: N14MagazinePistol10mm
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -52,6 +88,15 @@
- id: N14BoxPlasticFilledWastelander
- id: N14MagazinePistol12mm
- id: N14MagazinePistol12mm
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -64,6 +109,15 @@
- id: Magazine45SubMachineGun
- id: Magazine45SubMachineGun
- id: N14WeaponSMG45
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -73,6 +127,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledWastelander
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Canadian Mounties

Expand All @@ -87,6 +150,15 @@
- id: N14Bandage
- id: Ointment
- id: RadioHandheld
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -102,6 +174,15 @@
- id: N14Bandage
- id: Ointment
- id: RadioHandheld
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -117,7 +198,16 @@
- id: N14Bandage
- id: Ointment
- id: RadioHandheld

- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Military
- type: entity
noSpawn: true
Expand All @@ -127,6 +217,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledMilitary
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -136,6 +235,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledMilitaryNCR
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Town people
- type: entity
Expand All @@ -146,6 +254,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledWastelander
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -157,6 +274,15 @@
- id: N14BoxPlasticFilledWastelander
- id: N14PoliceBaton
- id: N14CombatKnife
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -168,6 +294,15 @@
- id: N14BoxPlasticFilledWastelander
- id: N14PoliceBaton
- id: N14CombatKnife
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Tribal
- type: entity
Expand All @@ -182,6 +317,15 @@
- id: Torch
- id: N14Bandage
- id: Ointment
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -198,6 +342,15 @@
- id: Ointment
- id: N14HealingPowder
- id: N14HealingPowder
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

# Vault
- type: entity
Expand All @@ -208,6 +361,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledWastelander
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -217,6 +379,15 @@
- type: StorageFill
contents:
- id: N14BoxPlasticFilledWastelander
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: true
Expand All @@ -228,6 +399,15 @@
- id: N14BoxPlasticFilledMilitary
- id: N14MagazinePistol10mm
- id: N14MagazinePistol10mm
- id: N14NewYearsGift
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift1
prob: 0.5
orGroup: Gift
- id: N14NewYearsGift2
prob: 0.5
orGroup: Gift

- type: entity
noSpawn: false
Expand Down
Loading
Loading