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

Big Food PR PT1 #29

Merged
merged 25 commits into from
Feb 14, 2023
Merged

Big Food PR PT1 #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
996b296
adds the basics for a number of meat; raw, cooked and cutlets
Peptide90 Aug 3, 2022
3585173
adds rads to meat
Peptide90 Aug 3, 2022
87b528b
adds basic reagents for food
Peptide90 Aug 5, 2022
b4fba43
save progress
Peptide90 Aug 6, 2022
6606358
pre war food textures and bulk code pt1
Peptide90 Aug 30, 2022
0a0ba85
Merge remote-tracking branch 'origin/master' into food
Peptide90 Aug 30, 2022
667115e
Merge remote-tracking branch 'upstream/master' into food
Peptide90 Sep 8, 2022
7bf58c6
Merge remote-tracking branch 'upstream/master' into food
Peptide90 Dec 24, 2022
9084620
Merge remote-tracking branch 'upstream/master' into food
Peptide90 Dec 24, 2022
966a1de
localisation stuff
Peptide90 Dec 24, 2022
a43e5eb
updates meat to new components
Peptide90 Dec 24, 2022
309a503
fixes sprite paths and parents of pre-war food
Peptide90 Dec 24, 2022
4d483e8
ID fix for nuka cola
Peptide90 Dec 24, 2022
7bf5cb2
produce update plus cabbages + juice
Peptide90 Dec 24, 2022
da8e762
trash placeholders, seeds and fixes
Peptide90 Jan 10, 2023
d92d68a
fixes reagents
Peptide90 Feb 12, 2023
9deadc9
added sprites from lonestar
Peptide90 Feb 13, 2023
8a096bb
fixes
Peptide90 Feb 13, 2023
1d1ecb1
removed placeholders from fallout shelter
Peptide90 Feb 13, 2023
cce5858
adds botany for produce segment
Peptide90 Feb 13, 2023
4e0c33b
another bug fix, yaml linter go brr
Peptide90 Feb 13, 2023
3ae1d06
nuka cola ID fixes while Im here
Peptide90 Feb 13, 2023
6c65107
UPDATE VENDING MACHINE
Peptide90 Feb 14, 2023
b8f92ac
removed space in filename
Peptide90 Feb 14, 2023
0bdda48
silly fix
Peptide90 Feb 14, 2023
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
Prev Previous commit
Next Next commit
nuka cola ID fixes while Im here
  • Loading branch information
@Peptide90
Peptide90 committed Feb 13, 2023
commit 3ae1d06bf451efe0b9a4b1694d6d336a8e92b193
7 changes: 6 additions & 1 deletion Resources/Prototypes/Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
- type: vendingMachineInventory
id: NukaRadInventory
startingInventory:
N14DrinkIrradiatedNukaColaBottleFull: 8

- type: vendingMachineInventory
id: NukaInventory
startingInventory:
DrinkIrradiatedNukaColaBottleFull: 8
N14DrinkNukaColaBottleFull: 8
13 changes: 12 additions & 1 deletion Resources/Prototypes/Nuclear14/Entities/Structures/Machines/vending_machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
parent: VendingMachine
id: VendingMachineNukaCola
id: N14VendingMachineNukaCola
name: Nuka-Cola machine
description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages.
components:
Expand All @@ -26,3 +26,14 @@
radius: 1.5
energy: 1.6
color: "#b34747"

- type: entity
parent: N14VendingMachineNukaCola
id: N14VendingMachineNukaColaIrradiated
name: Nuka-Cola machine
suffix: irradiated
description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages.
components:
- type: VendingMachine
pack: NukaRadInventory
# Needs a run down variant of the sprite