Skip to content

Commit

Permalink
Pretty Disposals (DeltaV-Station#1009)
Browse files Browse the repository at this point in the history
* initial commit

* oopshit conspace should not be an overlay

* minor fixes

* fix icon when constructing

* Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

* lets try it

Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: Azzy <azzydev@icloud.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
  • Loading branch information
7 people authored Sep 5, 2024
1 parent 2ec06e0 commit 02a4530
Show file tree
Hide file tree
Showing 19 changed files with 90 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
id: SpaceDisposalUnit
parent: DisposalUnit
name: space disposal unit
description: A pneumatic waste disposal unit with warning signs telling you that it leads to space and that NT is not responsible for any injury.
components:
- type: Sprite
sprite: DeltaV/Structures/Piping/disposal.rsi
snapCardinals: true
layers:
- state: condisposal
map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
- state: disposal
map: [ "enum.DisposalUnitVisualLayers.Base" ]
- state: disposal-flush
map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
- state: dispover-charge
map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
- state: dispover-ready
map: [ "enum.DisposalUnitVisualLayers.OverlayReady" ]
- state: dispover-full
map: [ "enum.DisposalUnitVisualLayers.OverlayFull" ]
- state: dispover-handle
map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
- state: space
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- Disposal
components:
- type: Sprite
sprite: Structures/Piping/disposal.rsi
sprite: DeltaV/Structures/Piping/disposal.rsi # DeltaV - Use old sprites
layers:
- state: condisposal
map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
Expand Down Expand Up @@ -71,7 +71,7 @@
name: disposal unit
components:
- type: Sprite
sprite: Structures/Piping/disposal.rsi
sprite: DeltaV/Structures/Piping/disposal.rsi # DeltaV - Use old sprites
snapCardinals: true
- type: Construction
graph: DisposalMachine
Expand All @@ -93,7 +93,7 @@
description: A pneumatic mail delivery unit.
components:
- type: Sprite
sprite: Structures/Piping/disposal.rsi
sprite: DeltaV/Structures/Piping/disposal.rsi # DeltaV - Use old sprites
snapCardinals: true
layers:
- state: conmailing
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Recipes/Construction/utilities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
placementMode: SnapgridCenter
canBuildInImpassable: false
icon:
sprite: Structures/Piping/disposal.rsi
sprite: DeltaV/Structures/Piping/disposal.rsi # Delta-V: Use old sprites
state: "disposal"

- type: construction
Expand All @@ -166,7 +166,7 @@
placementMode: SnapgridCenter
canBuildInImpassable: false
icon:
sprite: Structures/Piping/disposal.rsi
sprite: DeltaV/Structures/Piping/disposal.rsi # Delta-V: Use old sprites
state: "mailing"

- type: construction
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.
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.
60 changes: 60 additions & 0 deletions Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf, conspace & space recolors by rosieposieeee (github)",
"states": [
{
"name": "condisposal"
},
{
"name": "conmailing"
},
{
"name": "conspace"
},
{
"name": "disposal"
},
{
"name": "mailing"
},
{
"name": "space"
},
{
"name": "disposal-charging"
},
{
"name": "mailing-charging"
},
{
"name": "disposal-flush",
"delays": [ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.5, 0.1, 0.1, 0.1 ] ]
},
{
"name": "mailing-flush",
"delays": [ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.5, 0.1, 0.1, 0.1 ] ]
},
{
"name": "dispover-charge",
"delays": [ [ 0.4, 0.4 ] ]
},
{
"name": "dispover-full",
"delays": [ [ 0.2, 0.2 ] ]
},
{
"name": "dispover-handle"
},
{
"name": "mailover-handle"
},
{
"name": "dispover-ready"
}
]
}
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 02a4530

Please sign in to comment.