Skip to content

Commit

Permalink
Merge pull request #144 from dvir001/CuddlyCritter
Browse files Browse the repository at this point in the history
CuddlyCritterVend
  • Loading branch information
Cheackraze committed Aug 4, 2023
2 parents 989c1be + 9a6fbf3 commit c5e66d1
Show file tree
Hide file tree
Showing 18 changed files with 201 additions and 3 deletions.
Binary file added Resources/Audio/_NF/Items/Toys/wehhelp.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled
.desc = { ent-CrateVendingMachineRestockAmmoFilled.desc }
ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled }
.desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc }
.desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc }
ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled }
.desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -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.
.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.
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 10 additions & 1 deletion Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,13 @@
- type: StorageFill
contents:
- id: VendingMachineRestockCircuitVend
amount: 2
amount: 2

- type: entity
id: CrateVendingMachineRestockCuddlyCritterVendFilled
parent: CratePlastic
components:
- type: StorageFill
contents:
- id: VendingMachineRestockCuddlyCritterVend
amount: 2
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
25 changes: 25 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c5e66d1

Please sign in to comment.