Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resprait flatpack #719

Merged
merged 6 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
- type: cargoProduct
id: EngineSolar
icon:
sprite: Objects/Devices/flatpack.rsi
sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
state: solar-assembly-part
product: CrateEngineeringSolar
cost: 1250
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
id: BaseFlatpack
name: base flatpack
description: A flatpack used for constructing something.
categories:
- HideSpawnMenu
# categories:
# - HideSpawnMenu
components:
- type: Item
size: Large
- type: Sprite
sprite: Objects/Devices/flatpack.rsi
sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
layers:
- state: base
- state: overlay
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
id: AmePartFlatpack
name: steal-target-groups-ame-part-flatpack
sprite:
sprite: Objects/Devices/flatpack.rsi
sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
state: ame-part

- type: stealTargetGroup
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Parallaxes/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
scale: "3, 3"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit
slowness: 0.995
tiled: false
controlHomePosition: "-128, -128"
Expand All @@ -38,7 +38,7 @@
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
path: "/Textures/_SpaceCats/Objects/Devices/flatpack.rsi/ame-part.png" # Cats edit
slowness: 0.0
tiled: false
controlHomePosition: "0, 32"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- tag: SolarAssemblyFlatpack
name: solar assembly parts
icon:
sprite: Objects/Devices/flatpack.rsi
sprite: _SpaceCats/Objects/Devices/flatpack.rsi # Cats edit
state: solar-assembly-part
doAfter: 1

Expand Down
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.
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,59 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made for the Imperial Space community, authors'es discord nickname: pyrolizz | supermatter, sophie, oracle, fax-machine, emitter, authors'es github: CrimeMoot",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "overlay"
},
{
"name": "oracle"
},
{
"name": "sophie"
},
{
"name": "supermatter"
},
{
"name": "icon-default"
},
{
"name": "solar-assembly-part"
},
{
"name": "ame-part"
},
{
"name": "singularity-generator"
},
{
"name": "tesla-generator"
},
{
"name": "radiation-collector"
},
{
"name": "tesla-coil"
},
{
"name": "grounding-rod"
},
{
"name": "containment-field-generator"
},
{
"name": "emitter"
},
{
"name": "fax-machine"
}
]
}
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.
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