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

new pens for various departments #2735

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 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
60 changes: 58 additions & 2 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@
- type: Pda
id: QuartermasterIDCard
state: pda-qm
# Begin DeltaV changes
penSlot:
startingItem: PenLO
priority: -1
whitelist:
tags:
- Write
#End DeltaV changes
- type: PdaBorderColor
borderColor: "#e39751"
accentVColor: "#a23e3e"
Expand Down Expand Up @@ -544,7 +552,7 @@
id: CaptainIDCard
state: pda-captain
penSlot:
startingItem: PenCap
startingItem: PenCapNew #DeltaV
priority: -1
whitelist:
tags:
Expand All @@ -564,7 +572,7 @@
id: HoPIDCard
state: pda-hop
penSlot:
startingItem: PenHop
startingItem: PenHopNew #DeltaV
priority: -1
whitelist:
tags:
Expand All @@ -584,6 +592,14 @@
- type: Pda
id: CEIDCard
state: pda-ce
# Begin DeltaV changes
penSlot:
startingItem: PenCE
priority: -1
whitelist:
tags:
- Write
# End DeltaV changes
- type: PdaBorderColor
borderColor: "#949137"
accentHColor: "#447987"
Expand Down Expand Up @@ -614,6 +630,14 @@
- type: Pda
id: CMOIDCard
state: pda-cmo
# Begin DeltaV changes
penSlot:
startingItem: PenCMO
priority: -1
whitelist:
tags:
- Write
# End DeltaV changes
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#447987"
Expand Down Expand Up @@ -687,6 +711,14 @@
- type: Pda
id: RDIDCard
state: pda-rd
# Begin DeltaV changes
penSlot:
startingItem: PenMystagogue
priority: -1
whitelist:
tags:
- Write
# End DeltaV changes
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#447987"
Expand Down Expand Up @@ -732,6 +764,14 @@
- type: Pda
id: HoSIDCard
state: pda-hos
# Begin DeltaV changes
penSlot:
startingItem: PenHos
priority: -1
whitelist:
tags:
- Write
# End DeltaV changes
- type: PdaBorderColor
borderColor: "#A32D26"
accentHColor: "#447987"
Expand All @@ -756,6 +796,14 @@
- type: Pda
id: WardenIDCard
state: pda-warden
# Begin DeltaV changes
penSlot:
startingItem: PenWarden
priority: -1
whitelist:
tags:
- Write
# Begin DeltaV changes
- type: PdaBorderColor
borderColor: "#A32D26"
accentVColor: "#949137"
Expand Down Expand Up @@ -1027,6 +1075,14 @@
- type: Pda
id: PsychologistIDCard
state: pda-medical
#new delta v content
penSlot:
startingItem: PenPsych
priority: -1
whitelist:
tags:
- Write
#end delta v content
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments should be on the same indentation and should be formatted as such:

# Begin DeltaV changes
blah
blah
# End DeltaV changes

- type: PdaBorderColor
borderColor: "#d7d7d0"
accentVColor: "#447987"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Misc/pen.yml
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@
description: A luxurious fountain pen for the hop of the station.
components:
- type: Sprite
state: pen_hop
state: pen_hop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a end of file newline

6 changes: 6 additions & 0 deletions Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
- type: Pda
id: ChiefJusticeIDCard
state: pda-chiefjustice
penSlot:
startingItem: PenCJ
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#470823"
- type: Icon
Expand Down
101 changes: 101 additions & 0 deletions Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@

- type: entity
parent: PenEmbeddable
id: PenCMO
name: chief medical officer's pen
description: A fancy ballpoint pen belonging to the chief medical officer. Comes with enhanced surgical grip!
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_cmo

- type: entity
parent: PenEmbeddable
id: PenPsych
name: psychologist's pen
description: A cheap ballpoint pen belonging to the Psychologist. Understands you better than anyone.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_psych2

- type: entity
parent: PenEmbeddable
id: PenMystagogue
name: mystagogue's pen
description: An anomalous pen that may or may not have 0.001% chance of exploding when clicked.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_mystagogue

- type: entity
parent: PenEmbeddable
id: PenHos
name: head of security's pen
description: A robust pen, your strongest tool for keeping the peace.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_hos

- type: entity
parent: PenEmbeddable
id: PenWarden
name: warden's pen
description: An orderly pen that is chewed at the top from long hours in the office.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_warden

- type: entity
parent: PenEmbeddable
id: PenCE
name: chief engineer's pen
description: Once belonging to an egghead, it now belongs to you. Solves practical problems.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_ce

Radezolid marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: PenEmbeddable
id: PenLO
name: logistics officer's pen
description: An efficient pen. Vital for writing strongly worded letters to Epistemics.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_lo

- type: entity
parent: PenEmbeddable
id: PenCJ
name: chief justice's pen
description: A lawful pen adorned with a gold fountain tip.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_cj

- type: entity
parent: PenEmbeddable
id: PenCapNew
name: captain's fountain pen
description: A luxurious fountain pen for the captain of the station.
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_cap2

- type: entity
parent: PenEmbeddable
id: PenHopNew
name: head of personnel's pen
description: Looks oddly familiar...
components:
- type: Sprite
sprite: _DV/Objects/Misc/pens.rsi
state: pen_hop2

41 changes: 41 additions & 0 deletions Resources/Textures/_DV/Objects/Misc/pens.rsi/meta.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The JSON should be indented with 4 spaces instead of two.
Also you're missing an End of File newline.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSON needs to be indented with four spaces. For an example check out the foam sabre meta.json

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "New pen sprites by Kushbreth.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "pen_cap2"
},
{
"name": "pen_hos"
},
{
"name": "pen_cmo"
},
{
"name": "pen_psych2"
},
{
"name": "pen_ce"
},
{
"name": "pen_hop2"
},
{
"name": "pen_lo"
},
{
"name": "pen_warden"
},
{
"name": "pen_mystagogue"
},
{
"name": "pen_cj"
}
]
}
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