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

Jump to bottom

1984 Autmoadrobe, move robes #1875

Merged
merged 8 commits into from
Sep 21, 2024
+7 −19
Merged

1984 Autmoadrobe, move robes #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed9ca03
1984 Autmoadrobe, move robes
Avalon-Proto Sep 21, 2024
9f3ac41
Addedcommentgahhhhhhh
Avalon-Proto Sep 21, 2024
68823f8
TO THE AUTODROBE!!!
Avalon-Proto Sep 21, 2024
f20e350
Merge branch 'master' into Avalon-Branche
Avalon-Proto Sep 21, 2024
cb9b737
Delete the things, move the things
Avalon-Proto Sep 21, 2024
ccb8e23
Delete the things, move the things
Avalon-Proto Sep 21, 2024
35b82c6
Merge branch 'master' into Avalon-Branche
Avalon-Proto Sep 21, 2024
843213b
change price to 2100
TadJohnson00 Sep 21, 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
3 changes: 3 additions & 0 deletions Resources/Migrations/deltaMigrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,6 @@ FoodMealSoftTaco: FoodTacoShell

# 2024-08-18
BoxMagazinePistolSubMachineGunRubber: MagazineBoxPistolRubber

# 2024-09-21
VendingMachineAutomatrobe: null
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockAutoDrobeFilled
cost: 2000 # DeltaV
cost: 2100 # DeltaV
category: cargoproduct-category-name-service
group: market

Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
ClothingShoesBootsCowboyBrown: 1
ClothingShoesBootsCowboyBlack: 1
ClothingShoesBootsCowboyWhite: 1
ClothingHeadTechPriest: 2 #Delta V: Added Techpriest Robe to Inventory
ClothingOuterRobeTechPriest: 2

emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +0,0 @@
- type: vendingMachineInventory
id: AutomatrobeInventory
startingInventory:
ClothingUniformJumpsuitColorBlack: 2
ClothingUniformJumpskirtColorBlack: 2
ClothingShoesColorBlack: 2
ClothingHeadTechPriest: 2
ClothingOuterRobeTechPriest: 2
ClothingHeadsetScience: 2
ClothingOuterWinterRobo: 2
8 changes: 0 additions & 8 deletions Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,3 @@
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]

- type: entity
parent: VendingMachineRoboDrobe
id: VendingMachineAutomatrobe
Avalon-Proto marked this conversation as resolved.
Show resolved Hide resolved
name: Automatrobe
description: Automatically good.
components:
- type: VendingMachine
pack: AutomatrobeInventory
Loading