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

Psychologist & Lawyer stamp #849

Merged
merged 4 commits into from
Mar 8, 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: 2 additions & 0 deletions Resources/Locale/en-US/deltav/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
stamp-component-stamped-name-lawyer = Lawyer
stamp-component-stamped-name-psychologist = Psychologist
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@
- id: HandheldCrewMonitor
- id: DoorRemoteMedical
- id: RubberStampCMO
- id: RubberStampPsychologist # DeltaV
- id: MedicalTechFabCircuitboard
- id: BoxEncryptionKeyMedical
- id: BoxPDAMedical # Delta-V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
ClothingHeadsetService: 2
ClothingNeckLawyerbadge: 2
ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
RubberStampLawyer: 1 # DeltaV
emaggedInventory:
CyberPen: 1
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,24 @@
- id: EmergencyRollerBedSpawnFolded
- id: BodyBag_Folded
- id: Portafib

- type: entity
noSpawn: true
parent: ClothingBackpackMedical
id: ClothingBackpackPsychologistFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist


- type: entity
noSpawn: true
parent: ClothingBackpack
id: ClothingBackpackLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,24 @@
- id: EmergencyRollerBedSpawnFolded
- id: BodyBag_Folded
- id: Portafib

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelMedical
id: ClothingBackpackDuffelPsychologistFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist


- type: entity
noSpawn: true
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,24 @@
- id: EmergencyRollerBedSpawnFolded
- id: BodyBag_Folded
- id: Portafib

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelMedical
id: ClothingBackpackSatchelPsychologistFilled
components:
- type: StorageFill
contents:
- id: BoxSurvivalMedical
- id: RubberStampPsychologist


- type: entity
noSpawn: true
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
name: psychologist's rubber stamp
parent: RubberStampBase
id: RubberStampPsychologist
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-psychologist
stampedColor: "#00ccff"
stampState: "paper_stamp-psychologist"
- type: Sprite
sprite: DeltaV/Objects/Misc/stamps.rsi
state: stamp-psychologist

- type: entity
name: lawyer's rubber stamp
parent: RubberStampBase
id: RubberStampLawyer
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-lawyer
stampedColor: "#696969"
stampState: "paper_stamp-lawyer"
- type: Sprite
sprite: DeltaV/Objects/Misc/stamps.rsi
state: stamp-lawyer
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
id: LawyerGear
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants
back: ClothingBackpackFilled
back: ClothingBackpackLawyerFilled #DeltaV - stamp included
shoes: ClothingShoesBootsLaceup
id: LawyerPDA
ears: ClothingHeadsetSecurity
# TODO add copy of space law
inhand:
- BriefcaseBrownFilled
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included
duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
id: PsychologistGear
equipment:
jumpsuit: ClothingUniformJumpsuitPsychologist
back: ClothingBackpackMedicalFilled
back: ClothingBackpackPsychologistFilled #DeltaV - stamp included
shoes: ClothingShoesLeather
id: PsychologistPDA
ears: ClothingHeadsetMedical
innerClothingSkirt: ClothingUniformJumpsuitPsychologist
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled
satchel: ClothingBackpackSatchelPsychologistFilled #DeltaV - stamp included
duffelbag: ClothingBackpackDuffelPsychologistFilled #DeltaV - stamp included
17 changes: 17 additions & 0 deletions Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "stamp-lawyer"
},
{
"name": "stamp-psychologist"
}
]
}
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.
8 changes: 7 additions & 1 deletion Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -250,6 +250,12 @@
},
{
"name": "paper_stamp-mantis"
},
{
"name": "paper_stamp-lawyer"
},
{
"name": "paper_stamp-psychologist"
}
]
}
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