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

Mirror: The lawyer finally gets a stamp #185

Closed
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ stamp-component-stamped-name-mime = Mime
stamp-component-stamped-name-captain = Captain
stamp-component-stamped-name-centcom = CentCom
stamp-component-stamped-name-chaplain = Chaplain
stamp-component-stamped-name-lawyer = Lawyer
stamp-component-stamped-name-clown = Clown
stamp-component-stamped-name-cmo = Chief Medical Officer
stamp-component-stamped-name-denied = DENIED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,16 @@
- id: BoxSurvival
- id: Bible
- id: RubberStampChaplain

- type: entity
noSpawn: true
parent: ClothingBackpack
id: ClothingBackpackLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer

- type: entity
noSpawn: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,16 @@
- id: BoxSurvival
- id: Bible
- id: RubberStampChaplain

- type: entity
noSpawn: true
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer

- type: entity
noSpawn: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,16 @@
- id: BoxSurvival
- id: Bible
- id: RubberStampChaplain

- type: entity
noSpawn: true
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelLawyerFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampLawyer

- type: entity
noSpawn: true
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,19 @@
- type: Sprite
state: stamp-chaplain

- 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: "#233D57"
stampState: "paper_stamp-lawyer"
- type: Sprite
state: stamp-lawyer

- type: entity
name: clown's rubber stamp
parent: RubberStampBase
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
- type: startingGear
id: LawyerGear
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants
back: ClothingBackpackLawyerFilled #DeltaV - stamp included
jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants # ignoring this since loadouts are gonna be out soon
back: ClothingBackpackLawyerFilled
shoes: ClothingShoesBootsLaceup
id: LawyerPDA
ears: ClothingHeadsetSecurity
# TODO add copy of space law
inhand:
- BriefcaseBrownFilled
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included
duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included
satchel: ClothingBackpackSatchelLawyerFilled
duffelbag: ClothingBackpackDuffelLawyerFilled
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@
{
"name": "paper_stamp-chaplain"
},
{
"name": "paper_stamp-lawyer"
},
{
"name": "paper_stamp-clown"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 63 additions & 60 deletions Resources/Textures/Objects/Misc/stamps.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,65 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "stamp-cap"
},
{
"name": "stamp-ce"
},
{
"name": "stamp-centcom"
},
{
"name": "stamp-chaplain"
},
{
"name": "stamp-clown"
},
{
"name": "stamp-cmo"
},
{
"name": "stamp-deny"
},
{
"name": "stamp-detective"
},
{
"name": "stamp-hop"
},
{
"name": "stamp-hos"
},
{
"name": "stamp-ok"
},
{
"name": "stamp-mime"
},
{
"name": "stamp-qm"
},
{
"name": "stamp-rd"
},
{
"name": "stamp-syndicate"
},
{
"name": "stamp-trader"
},
{
"name": "stamp-warden"
}
]
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "stamp-cap"
},
{
"name": "stamp-ce"
},
{
"name": "stamp-centcom"
},
{
"name": "stamp-chaplain"
},
{
"name": "stamp-lawyer"
},
{
"name": "stamp-clown"
},
{
"name": "stamp-cmo"
},
{
"name": "stamp-deny"
},
{
"name": "stamp-detective"
},
{
"name": "stamp-hop"
},
{
"name": "stamp-hos"
},
{
"name": "stamp-ok"
},
{
"name": "stamp-mime"
},
{
"name": "stamp-qm"
},
{
"name": "stamp-rd"
},
{
"name": "stamp-syndicate"
},
{
"name": "stamp-trader"
},
{
"name": "stamp-warden"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading