Skip to content

Commit

Permalink
Shredders (#499)
Browse files Browse the repository at this point in the history
* Added Circuitvend Art

*Circuitvend Sprite

*Amended vending_machines.yml to show sprite

* Shredding Sprites

Added nanotransen and syndicate shredder sprites
-Off
-Idle
-Shredding money
-not shredding anything

* Shredder, 2!

Even better JSON

* Added a non functional Shredder

It will gladly take your money, but nothing else

* Added Shredder

Based off the lathe, the shredder is spawnable and interactable.

* tests fix

* fix more

* more fix

* more normal

---------

Co-authored-by: checkraze <[email protected]>
  • Loading branch information
IData-RedactedI and Cheackraze authored Oct 29, 2023
1 parent b774562 commit badb160
Show file tree
Hide file tree
Showing 15 changed files with 166 additions and 0 deletions.
16 changes: 16 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
id: ShredderMachineCircuitboard
parent: BaseMachineCircuitboard
name: shredder machine board
description: A machine printed circuit board for a shredder.
components:
- type: Sprite
state: engineering
- type: MachineBoard
prototype: Shredder
requirements:
MatterBin: 1
materialRequirements:
Glass: 1
- type: StaticPrice
price: 100
33 changes: 33 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: entity
id: Shredder
parent: BaseLathe
name: shredder
description: It shreds things. What more is there to say?
components:
- type: Sprite
sprite: _NF/Structures/Machines/shredder.rsi
snapCardinals: true
layers:
- state: icon
map: ["enum.LatheVisualLayers.IsRunning"]
- state: normal
shader: unshaded
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: shredding-empty
map: ["enum.MaterialStorageVisualLayers.Inserting"]
- type: Machine
board: ShredderMachineCircuitboard
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: MaterialStorage
dropOnDeconstruct: false
whitelist:
components:
- Currency
- type: Lathe
idleState: icon
runningState: shredding-money
canEjectStoredMaterials: false
staticRecipes:
- ShreddedMoney
7 changes: 7 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: latheRecipe
id: ShreddedMoney
icon: { sprite: Objects/Misc/module.rsi, state: id_mod }
result: ShredderMachineCircuitboard
completetime: 3
materials:
Credit: 1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-NC-SA-3.0",
"copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ",
"states": [
{
"name": "icon"
},
{
"name": "normal"
},
{
"name": "shredding-empty",
"delays": [
[
0.1,
0.1,
0.1
]
]

},
{
"name": "shredding-money",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "shredding-paper",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
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.
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,55 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-NC-SA-3.0",
"copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ",
"states": [
{
"name": "off"
},
{
"name": "normal"
},
{
"name": "shredding-empty",
"delays": [
[
0.1,
0.1,
0.1
]
]

},
{
"name": "shredding-money",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "shredding-paper",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
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.
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 badb160

Please sign in to comment.