diff --git a/Resources/Audio/_NF/Items/Toys/wehhelp.ogg b/Resources/Audio/_NF/Items/Toys/wehhelp.ogg new file mode 100644 index 00000000000..c16495a5305 Binary files /dev/null and b/Resources/Audio/_NF/Items/Toys/wehhelp.ogg differ diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl new file mode 100644 index 00000000000..0a73137580a --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/cuddlycritter.ftl @@ -0,0 +1,8 @@ +advertisement-cuddlycritter-1 = Brighten your day with a fluffy friend! +advertisement-cuddlycritter-2 = Hug therapy starts here! +advertisement-cuddlycritter-3 = Give in to the plushie temptation! +advertisement-cuddlycritter-4 = You won't resist their charm! +advertisement-cuddlycritter-5 = Warning: Extreme cuteness ahead! +advertisement-cuddlycritter-6 = Help me I'm trapped in a NanoTrasen factory forced to make Plushies! +advertisement-cuddlycritter-7 = Softer then asbestos! +advertisement-cuddlycritter-8 = The best crayon colors in space, proposition 65 \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl index bf60f433b57..efca148a5bc 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl @@ -5,4 +5,7 @@ ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled .desc = { ent-CrateVendingMachineRestockAmmoFilled.desc } ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled } - .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc } \ No newline at end of file + .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc } + +ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled } + .desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl index baa70b0a40c..00310d9bc51 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl @@ -5,4 +5,7 @@ ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate .desc = Contains two restock boxes for the Liberation vending machine. ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate - .desc = Contains two restock boxes for a CircuitVend vending machine. \ No newline at end of file + .desc = Contains two restock boxes for a CircuitVend vending machine. + +ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate + .desc = Contains two restock boxes for a CuddlyCritterVend vending machine. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index 9d74715c531..bf51e459aae 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -35,3 +35,13 @@ cost: 100 category: Science group: market + +- type: cargoProduct + id: CrateVendingMachineRestockCuddlyCritterVend + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockCuddlyCritterVendFilled + cost: 100 + category: fun + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 8373ba1289a..678bfc2e7cc 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -23,4 +23,13 @@ - type: StorageFill contents: - id: VendingMachineRestockCircuitVend - amount: 2 \ No newline at end of file + amount: 2 + +- type: entity + id: CrateVendingMachineRestockCuddlyCritterVendFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockCuddlyCritterVend + amount: 2 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml new file mode 100644 index 00000000000..b74f4cef0ce --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/cuddlycritter.yml @@ -0,0 +1,11 @@ +- type: advertisementsPack + id: CuddlyCritterAds + advertisements: + - advertisement-cuddlycritter-1 + - advertisement-cuddlycritter-2 + - advertisement-cuddlycritter-3 + - advertisement-cuddlycritter-4 + - advertisement-cuddlycritter-5 + - advertisement-cuddlycritter-6 + - advertisement-cuddlycritter-7 + - advertisement-cuddlycritter-8 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml new file mode 100644 index 00000000000..bd941787365 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -0,0 +1,36 @@ +- type: vendingMachineInventory + id: CuddlyCritterVendInventory + startingInventory: + PlushieBee: 3 + PlushieHampter: 3 + PlushieLizard: 3 + PlushieSpaceLizard: 3 + PlushieVox: 3 + PlushieMoff: 3 + PlushieMoffsician: 3 + PlushieMoffbar: 3 + PlushieDiona: 3 + PlushieSharkGrey: 3 + PlushieSharkBlue: 3 + PlushieSharkPink: 3 + PlushieRatvar: 3 + PlushieNar: 3 + PlushieSlime: 3 + PlushieSnake: 3 + PlushieCarp: 3 + PlasticBanana: 3 + BeachBall: 2 + Basketball: 2 + Football: 2 + ToyHammer: 2 + WhoopieCushion: 2 + ClownRecorder: 1 + PonderingOrb: 1 + CrayonRainbow: 5 + contrabandInventory: + PlushieLamp: 3 + emaggedInventory: + PlushieJester: 3 + PlushieNuke: 3 + PlushieRGBee: 3 + BalloonCorgi: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml new file mode 100644 index 00000000000..89f29c10d2e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml @@ -0,0 +1,25 @@ +## Plushies + +- type: entity + parent: BasePlushie + id: PlushieJester #Weh! + name: jester plushie + description: A dubious little creature getting up to mischief. + components: + - type: Sprite + sprite: _NF/Objects/Fun/toys.rsi + state: plushie_jester + - type: EmitSoundOnUse + sound: + path: /Audio/_NF/Items/Toys/wehhelp.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_NF/Items/Toys/wehhelp.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/_NF/Items/Toys/wehhelp.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/_NF/Items/Toys/wehhelp.ogg +# - type: MarketPrice # TODO fix price +# price: 1000 # TODO fix price \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index d9637d573e3..b4f02cd2475 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -97,3 +97,19 @@ shader: unshaded - state: refill_parts # Update this later with a new sprite - type: CargoSellBlacklist + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockCuddlyCritterVend + name: CuddlyCritterVend restock box + description: A box containing toys and plushies for the Cuddly Critter vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - CuddlyCritterVendInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_parts # TODO Update this later with a new sprite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..9a4e6ff1147 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,32 @@ +- type: entity + parent: VendingMachine + id: VendingMachineCuddlyCritterVend + name: CuddlyCritterVend + description: Step into the world of wonder and warmth with Cuddly Critters Vending Machine, a haven for plushie and toy enthusiasts alike. + components: + - type: Anchorable + delay: 999999 + - type: VendingMachine + pack: CuddlyCritterVendInventory + offState: off + brokenState: broken + normalState: normal-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples + - type: Advertise + pack: CuddlyCritterAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/cuddlycritter.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#4b93ad" + - type: MarketModifier + mod: 10 \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json new file mode 100644 index 00000000000..bb19d688c11 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "plushie_jester: gentlejester-148196053781315584", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plushie_jester" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_jester.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_jester.png new file mode 100644 index 00000000000..267331f72fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_jester.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png new file mode 100644 index 00000000000..c84c3985a50 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/broken.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json new file mode 100644 index 00000000000..f634aaed47e --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "gentlejester-148196053781315584", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png new file mode 100644 index 00000000000..8cd03ee9ad6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png new file mode 100644 index 00000000000..4a57de8fb4d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/off.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png new file mode 100644 index 00000000000..dcb37dea9df Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/panel.png differ