From 4d35bf002c567dfe703ebe195549944277aba38c Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:02:02 -0500 Subject: [PATCH] Party Crate (#12794) * party time * inflation --- .../prototypes/catalog/cargo/cargo-fun.ftl | 3 ++ .../catalog/fills/crates/fun-crates.ftl | 3 ++ .../Prototypes/Catalog/Cargo/cargo_fun.yml | 10 +++++ .../Prototypes/Catalog/Fills/Crates/fun.yml | 39 +++++++++++++++---- 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-fun.ftl index bbffe3878a..48014ce0ef 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-fun.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-fun.ftl @@ -15,3 +15,6 @@ ent-FunBoardGames = { ent-CrateFunBoardGames } ent-FunATV = { ent-CrateFunATV } .desc = { ent-CrateFunATV.desc } + +ent-FunParty = { ent-CrateFunParty } + .desc = { ent-CrateFunParty.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl index a6824d83d0..6c55b86353 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl @@ -22,5 +22,8 @@ ent-CrateFunSadTromboneImplants = Sad Trombone Implants ent-CrateFunLightImplants = Light Implants .desc = Light up your skin with these implants! +ent-CrateFunParty = Party Crate + .desc = An entire party just waiting for you to open it. Includes party favors, party beverages, and even a cake. + ent-CrateFunSyndicateSegway = Syndicate segway crate .desc = A crate containing a two-wheeler that will help you escape from the security officers. Or not. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index d94fda2292..d695a66c35 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -28,6 +28,16 @@ category: Fun group: market +- type: cargoProduct + id: FunParty + icon: + sprite: Objects/Consumable/Food/Baked/cake.rsi + state: birthday + product: CrateFunParty + cost: 1000 + category: Fun + group: market + - type: cargoProduct id: FunPlushies icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 3954425b5b..ae51a5773a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -113,10 +113,10 @@ components: - type: StorageFill contents: - - id: VehicleATV - amount: 1 - - id: VehicleKeyATV - amount: 1 + - id: VehicleATV + amount: 1 + - id: VehicleKeyATV + amount: 1 - type: entity id: CrateFunSadTromboneImplants @@ -131,11 +131,34 @@ id: CrateFunLightImplants parent: CrateGenericSteel components: - - type: StorageFill - contents: - - id: LightImplanter - amount: 3 + - type: StorageFill + contents: + - id: LightImplanter + amount: 3 +- type: entity + id: CrateFunParty + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: GlowstickBase + amount: 2 + - id: GlowstickBlue + amount: 2 + - id: GlowstickPurple + amount: 2 + - id: GlowstickRed + amount: 2 + - id: GlowstickYellow + amount: 2 + - id: FoodCakeBirthday + amount: 1 + - id: DrinkLean + amount: 4 + - id: KnifePlastic + amount: 1 + - type: entity id: CrateFunSyndicateSegway parent: CrateLivestock