diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index 50695edc194..df1432611ba 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -3,6 +3,7 @@ startingInventory: HappyHonk: 10 HappyHonkMime: 4 + MysteryFigureBoxBulk: 5 emaggedInventory: HappyHonkCluwne: 1 HappyHonkNukie: 1 diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml index dbbe86678f0..9085f9be338 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml @@ -133,3 +133,6 @@ - id: ToyFigurineHamlet prob: 0.20 orGroup: SpacemenFig + - type: Tag + tags: + - MysteryFigureBox diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml index aeb1b44a58f..4cb324ddf55 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml @@ -47,13 +47,3 @@ cost: 1000 category: Fun group: market - -# - type: cargoProduct - # id: FunDawInstrument - # icon: - # sprite: Objects/Fun/Instruments/structureinstruments.rsi - # state: daw-base - # product: DawInstrument - # cost: 15000 - # category: Fun - # group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 13ed67b0812..25284bdc0ec 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -86,3 +86,24 @@ contents: - id: PaperCaptainsThoughts amount: 10 + +- type: entity + name: mystery spacemen minifigure bulk box + parent: BoxCardboard + id: MysteryFigureBoxBulk + description: A box containing six mystery minifigure boxes. + components: + - type: StorageFill + contents: + - id: MysteryFigureBox + amount: 6 + - type: Storage + capacity: 30 + whitelist: + tags: + - MysteryFigureBox + - type: Sprite + layers: + - state: box + - type: VendPrice + price: 1200 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index c18a7544e54..9b4f15ab78d 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -34,6 +34,9 @@ - type: Tag id: LavaMercenary +- type: Tag + id: MysteryFigureBox + - type: Tag id: WhoopieCushion