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

Add new wall lockers + other storage bonuses #2636

Merged
merged 7 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from 3 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
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,12 @@
name: scientist's locker
components:
- type: Appearance
- type: Sprite
sprite: _DV/Structures/Storage/closet.rsi # DeltaV - label locker with "E" for epi
boogiebogus marked this conversation as resolved.
Show resolved Hide resolved
- type: EntityStorageVisuals
stateBaseClosed: science
stateDoorOpen: science_open
stateDoorClosed: science_door
stateBaseClosed: epi # DeltaV
stateDoorOpen: epi_open # DeltaV
stateDoorClosed: epi_door # DeltaV
- type: AccessReader
access: [ [ "Research" ] ]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
name: epistemics crate # DeltaV - Epistemics Department replacing Science
components:
- type: Icon
sprite: Structures/Storage/Crates/science.rsi
sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science
- type: Sprite
sprite: Structures/Storage/Crates/science.rsi
sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science

- type: entity
parent: CrateGenericSteel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,42 @@
stateDoorClosed: admin_assist_door
- type: AccessReader
access: [["Command"]]

- type: entity
parent: LockerBaseSecureDeltaV
id: LockerKitchen
name: kitchen locker
components:
- type: Appearance
boogiebogus marked this conversation as resolved.
Show resolved Hide resolved
- type: EntityStorageVisuals
stateBaseClosed: chef
stateDoorOpen: chef_open
stateDoorClosed: chef_door
- type: AccessReader
access: [["Kitchen"]]

- type: entity
parent: LockerBaseSecureDeltaV
id: LockerJanitor
name: janitor's locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: jani
stateDoorOpen: jani_open
stateDoorClosed: jani_door
- type: AccessReader
access: [["Janitor"]]

- type: entity
parent: LockerBaseSecure
id: LockerLogistics # Wizden has sprites for this but doesn't have an entity that uses them?
name: logistics locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: cargo
stateDoorOpen: cargo_open
stateDoorClosed: cargo_door
- type: AccessReader
access: [["Cargo"]]
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
- type: entity
parent: BaseWallCloset
id: BaseWallClosetDeltaV
components:
- type: Sprite
sprite: _DV/Structures/Storage/wall_locker.rsi

- type: entity
parent: BaseWallLocker
id: BaseWallLockerDeltaV
components:
- type: Sprite
sprite: _DV/Structures/Storage/wall_locker.rsi

- type: entity
parent: BaseWallClosetDeltaV
id: WallClosetTools
name: tool wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: engi_generic
stateDoorClosed: engi_tools_door
stateDoorOpen: engi_generic_open
boogiebogus marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: BaseWallClosetDeltaV
id: WallClosetRadiationSuit
name: radiation suit wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: engi_generic
stateDoorClosed: engi_rad_door
stateDoorOpen: engi_generic_open

- type: entity
parent: BaseWallClosetDeltaV
id: WallClosetL3
name: level 3 biohazard wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: bio
stateDoorClosed: bio_door
stateDoorOpen: bio_open

- type: entity
parent: WallClosetL3
id: WallClosetL3Janitor
name: level 3 biohazard wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: bio_jani
stateDoorClosed: bio_jani_door
stateDoorOpen: bio_jani_open

- type: entity
parent: WallClosetL3
id: WallClosetL3Security
name: level 3 biohazard wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: bio_sec
stateDoorClosed: bio_sec_door
stateDoorOpen: bio_sec_open

- type: entity
parent: WallClosetL3
id: WallClosetL3Virology
name: level 3 biohazard wall closet
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: bio_viro
stateDoorClosed: bio_viro_door
stateDoorOpen: bio_viro_open

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerAtmos
name: atmospherics wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: atmos
stateDoorClosed: atmos_door
stateDoorOpen: atmos_open
- type: AccessReader
access: [["Atmospherics"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerEngi
name: engineering wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: engi
stateDoorClosed: engi_door
stateDoorOpen: engi_open
- type: AccessReader
access: [["Engineering"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerElectrical
name: electrical wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: engi_generic
stateDoorClosed: engi_electrical_door
stateDoorOpen: engi_generic_open
- type: AccessReader
access: [["Engineering"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerWelding
name: welding tools wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: engi_generic
stateDoorClosed: engi_welding_door
stateDoorOpen: engi_generic_open
- type: AccessReader
access: [["Engineering"]]


- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerBotany
name: botanist wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: botany
stateDoorClosed: botany_door
stateDoorOpen: botany_open
- type: AccessReader
access: [["Hydroponics"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerSalvage
name: salvage wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: salv
stateDoorClosed: salv_door
stateDoorOpen: salv_open
- type: AccessReader
access: [["Salvage"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerLogistics
name: logistics wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: logi
stateDoorClosed: logi_door
stateDoorOpen: logi_open
- type: AccessReader
access: [["Cargo"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerJanitor
name: janitor wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: jani
stateDoorClosed: jani_door
stateDoorOpen: jani_open
- type: AccessReader
access: [["Janitor"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerEpistemics
name: epistemics wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: epi
stateDoorClosed: epi_door
stateDoorOpen: epi_open
- type: AccessReader
access: [["Research"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerSecurity
name: security wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: sec
stateDoorClosed: sec_door
stateDoorOpen: sec_open
- type: AccessReader
access: [["Security"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerKitchen
name: kitchen wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: chef
stateDoorClosed: chef_door
stateDoorOpen: chef_open
- type: AccessReader
access: [["Kitchen"]]

- type: entity
parent: BaseWallLockerDeltaV
id: WallLockerJustice
name: justice wall locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: justice
stateDoorClosed: justice_door
stateDoorOpen: justice_open
- type: AccessReader
access: [["Justice"]]
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.
boogiebogus marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
boogiebogus marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "closed"
},
{
"name": "open"
},
{
"name": "welded"
},
{
"name": "sparking",
"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.
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.
29 changes: 28 additions & 1 deletion Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord)",
"copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Chef, janitor, and epistemics door modified from tgstation sprites by bogus_0451 (Discord).",
"license": "CC-BY-SA-3.0",
"states": [
{
Expand Down Expand Up @@ -63,6 +63,33 @@
},
{
"name": "admin_assist_open"
},
{
"name": "epi"
},
{
"name": "epi_door"
},
{
"name": "epi_open"
},
{
"name": "jani"
},
{
"name": "jani_door"
},
{
"name": "jani_open"
},
{
"name": "chef"
},
{
"name": "chef_door"
},
{
"name": "chef_open"
}
]
}
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
Loading