Skip to content

Commit

Permalink
Add New Sprites (Simple-Station#1174)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR adds new prites for lockers, wall lockers and PDA.

the new PDA sprites are to be added to the loadout for command jobs in
the future

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->


---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/ddc0afd0-65d4-473c-b8bc-d941d2409447)

![image](https://github.com/user-attachments/assets/1e5bc6fb-da03-41e0-94a4-f3cf982dac82)

![image](https://github.com/user-attachments/assets/34f883cb-0d75-4bcb-bcf4-4cf219cf22e9)

![image](https://github.com/user-attachments/assets/4610fd69-91a9-44d0-93d3-702445882674)


</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: lockers for Syndicate Agent (for mapping), Janitor and Bartender
have been added.
- add: a new wall variant has been added for the radiation closet
- add: Uranium Crate added

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
Ichaie and VMSolidus authored Nov 2, 2024
1 parent c5a40ee commit b553ce9
Show file tree
Hide file tree
Showing 36 changed files with 318 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,15 @@
- id: WeaponSniperMosin
prob: 0.0010
orGroup: syndiemaintloot

- type: entity
id: ClosetWallRadiationFilled
suffix: Filled
parent: ClosetWallRadiation
components:
- type: StorageFill
contents:
- id: ClothingOuterSuitRad
amount: 2
- id: GeigerCounter
amount: 2
143 changes: 143 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,27 @@
- NewsReaderCartridge
- MailMetricsCartridge

- type: entity
name: LO special PDA unit # DeltaV - Logistics Department replacing Cargo
parent: BasePDA
id: QuartermasterNTPDA
description: PDA for the guy that directs logistics.it says in gold "special unit unique to the best logistics officer in the sector". # DeltaV - Logistics Department replacing Cargo
components:
- type: Pda
id: QuartermasterIDCard
state: pda-qmnano
- type: PdaBorderColor
borderColor: "#e39751"
accentVColor: "#a23e3e"
- type: Icon
state: pda-qmnano
- type: CartridgeLoader # Adds the MailMetrics courier tracker
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- MailMetricsCartridge

- type: entity
parent: BasePDA
id: CargoPDA
Expand Down Expand Up @@ -495,6 +516,26 @@
- type: Icon
state: pda-captain

- type: entity
parent: BasePDA
id: CaptainNTPDA
name: CAP special PDA unit
description: incredibly shining with embossed details.it says in gold "special unit unique to the best captain in the sector".
components:
- type: Pda
id: CaptainIDCard
state: pda-captainnano
penSlot:
startingItem: PenCap
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#7C5D00"
- type: Icon
state: pda-captainnano

- type: entity
parent: BasePDA
id: HoPPDA
Expand All @@ -516,6 +557,27 @@
- type: Icon
state: pda-hop

- type: entity
parent: BasePDA
id: HoPNTPDA
name: HOP special PDA unit
description: Looks like it's been chewed on.it says in gold "special unit unique to the best head of personnel in the sector".
components:
- type: Pda
id: HoPIDCard
state: pda-hopnano
penSlot:
startingItem: PenHop
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#789876"
accentHColor: "#447987"
- type: Icon
state: pda-hopnano

- type: entity
parent: BasePDA
id: CEPDA
Expand All @@ -531,6 +593,21 @@
- type: Icon
state: pda-ce

- type: entity
parent: BasePDA
id: CENTPDA
name: CE special PDA unit
description: Looks like it's barely been used.it says in gold "special unit unique to the best chief engineer in the sector".
components:
- type: Pda
id: CEIDCard
state: pda-cenano
- type: PdaBorderColor
borderColor: "#949137"
accentHColor: "#447987"
- type: Icon
state: pda-cenano

- type: entity
parent: BasePDA
id: EngineerPDA
Expand Down Expand Up @@ -568,6 +645,28 @@
- type: Icon
state: pda-cmo

- type: entity
parent: BaseMedicalPDA
id: CMONTPDA
name: CMO special pda unit
description: Extraordinarily shiny and sterile.it says in gold "special unit unique to the best chief medical officer in the sector". Has a built-in health analyzer.
components:
- type: Pda
id: CMOIDCard
state: pda-cmonano
penSlot: # Fancy Pen Light
startingItem: CMOPenLight
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#447987"
accentVColor: "#447987"
- type: Icon
state: pda-cmonano

- type: entity
parent: BaseMedicalPDA
id: MedicalPDA
Expand Down Expand Up @@ -656,6 +755,28 @@
- NewsReaderCartridge
- GlimmerMonitorCartridge

- type: entity
parent: BasePDA
id: RnDNTPDA
name: MY special PDA unit # DeltaV - Epistemics Department replacing Science
description: It appears surprisingly ordinary.it says in gold "special unit unique to the best Mystagogue in the sector".
components:
- type: Pda
id: RDIDCard
state: pda-rdnano
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#447987"
accentVColor: "#8900c9"
- type: Icon
state: pda-rdnano
- type: CartridgeLoader # Nyanotrasen - Glimmer Monitor
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- GlimmerMonitorCartridge

- type: entity
parent: BasePDA
id: SciencePDA
Expand Down Expand Up @@ -714,6 +835,28 @@
- CrimeAssistCartridge
- SecWatchCartridge

- type: entity
parent: BasePDA
id: HoSNTPDA
name: HOS special PDA unit
description: Whosoever bears this PDA is the law.it says in gold "special unit unique to the best head of security in the sector".
components:
- type: Pda
id: HoSIDCard
state: pda-hosnano
- type: PdaBorderColor
borderColor: "#A32D26"
accentHColor: "#447987"
- type: Icon
state: pda-hosnano
- type: CartridgeLoader # DeltaV - Crime Assist + SecWatch
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
- CrimeAssistCartridge
- SecWatchCartridge

- type: entity
parent: BasePDA
id: WardenPDA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
openSound:
path: /Audio/Effects/woodenclosetopen.ogg

# Bartender
- type: entity
id: LockerBartender
parent: LockerBase
name: bartender's locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: bartender
stateDoorOpen: bartender_open
stateDoorClosed: bartender_door
- type: AccessReader
access: [ [ "Bar" ] ]

# Basic
- type: entity
id: LockerSteel
Expand Down Expand Up @@ -194,6 +208,20 @@
- type: AccessReader
access: [ [ "Hydroponics" ] ]

# Janitor
- type: entity
id: LockerJanitor
parent: LockerBase
name: janitor locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: jan
stateDoorOpen: jan_open
stateDoorClosed: jan_door
- type: AccessReader
access: [ [ "Janitor" ] ]

# Medicine
- type: entity
id: LockerMedicine
Expand Down Expand Up @@ -394,6 +422,20 @@
stateDoorOpen: syndicate_open
stateDoorClosed: syndicate_door

- type: entity
id: LockerSyndicateAgentLocker
name: syndicate agent locker
parent: LockerBase
description: It's a personal storage unit for agent gear.
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: syndicate1
stateDoorOpen: syndicate1_open
stateDoorClosed: syndicate1_door
- type: AccessReader
access: [ [ "SyndicateAgent" ] ]

# Bluespace
- type: entity
id: LockerBluespaceStation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@
stateDoorOpen: emergency_open
stateDoorClosed: emergency_door

- type: entity
id: ClosetWallRadiation
name: radiation wall closet
parent: BaseWallCloset
description: It's a storage unit for radiation equipment
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: rad
stateDoorOpen: rad_open
stateDoorClosed: rad_door

- type: entity
id: ClosetWallFire
name: fire-safety wall closet
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,18 @@
- type: AccessReader
access: [["Engineering"], ["Research"], ["Chemistry"]]

- type: entity
parent: CrateBaseSecure
id: CrateUranium
name: uranium crate
components:
- type: Icon
sprite: Structures/Storage/Crates/uranium.rsi
- type: Sprite
sprite: Structures/Storage/Crates/uranium.rsi
- type: AccessReader
access: [["Engineering"], ["Research"]]

- type: entity
parent: CrateBaseSecure
id: CrateSecure
Expand Down
21 changes: 21 additions & 0 deletions Resources/Textures/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,27 @@
{
"name": "pda-atmos"
},
{
"name": "pda-cmonano"
},
{
"name": "pda-hopnano"
},
{
"name": "pda-hosnano"
},
{
"name": "pda-rdnano"
},
{
"name": "pda-cenano"
},
{
"name": "pda-qmnano"
},
{
"name": "pda-captainnano"
},
{
"name": "pda-bartender"
},
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.
45 changes: 45 additions & 0 deletions Resources/Textures/Structures/Storage/Crates/uranium.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
"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
]
]
},
{
"name": "locked"
},
{
"name": "unlocked"
}
]
}
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

0 comments on commit b553ce9

Please sign in to comment.