Skip to content

Commit

Permalink
address reviews, add back clothing
Browse files Browse the repository at this point in the history
  • Loading branch information
Elijahrane committed Sep 7, 2024
1 parent c6e829c commit e1f73d6
Show file tree
Hide file tree
Showing 66 changed files with 473 additions and 27 deletions.
31 changes: 10 additions & 21 deletions Resources/Migrations/eeMigration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@ Oracle: OracleSpawner
SophicScribe: SophicScribeSpawner

# 2024-09-06
ClothingUniformJumpsuitProsecutor: null
ClothingUniformJumpsuitClerk: null
ClothingUniformJumpsuitChiefJustice: null
ClothingUniformJumpskirtChiefJustice: null
ClothingUniformJumpsuitChiefJusticeWhite: null
ClothingUniformJumpsuitChiefJusticeFormal: null
ClothingOuterChiefJustice: null
ChiefJusticePDA: null
ChiefJusticeIDCard: null
LockerChiefJustice: null
LockerChiefJusticeFilled: null
SpawnPointChiefJustice: null
DefaultStationBeaconJustice: null
DefaultStationBeaconChiefJustice: null
DefaultStationBeaconProsecutor: null
RubberStampChiefJustice: null
AirlockJustice: Airlock
AirlockJusticeGlass: AirlockGlass
AirlockChiefJusticeLocked: AirlockLawyerLocked
Expand All @@ -39,12 +23,18 @@ WindoorSecureJusticeLocked: WindoorSecureLawyerLocked
DoorElectronicsChiefJustice: DoorElectronicsLawyer
DoorElectronicsJustice: DoorElectronicsLawyer
DoorElectronicsProsecutor: DoorElectronicsLawyer
ClothingNeckProsecutorbadge: null
ChiefJusticePDA: null
ChiefJusticeIDCard: null
LockerChiefJustice: null
LockerChiefJusticeFilled: null
SpawnPointChiefJustice: null
DefaultStationBeaconJustice: null
DefaultStationBeaconChiefJustice: null
DefaultStationBeaconProsecutor: null
RubberStampChiefJustice: null
ProsecutorPDA: null
ClothingUniformJumpskirtProsecutor: null
BoxPDAJustice: null
SpawnPointProsecutor: null
ClothingUniformJumpskirtClerk: null
SpawnPointClerk: null
ProsecutorIDCard: null
LockerClerk: null
Expand All @@ -55,6 +45,5 @@ RubberStampNotary: null
EncryptionKeyJustice: null
ClothingHeadsetJustice: null
DoorRemoteJustice: null
ClothingHeadHatCJToque: null
SignDirectionalJuistice: null
SignDirectionalJustice: null
PaperStationWarrant: null
14 changes: 13 additions & 1 deletion Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,16 @@
- type: Sprite
sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCJToque
name: chief justice's toque
description: A standard-issue judicial hat. Wigs are old-fashioned anyway.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi

18 changes: 15 additions & 3 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- type: Sprite
sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi
sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi

- type: entity
parent: ClothingNeckBase
Expand All @@ -28,6 +28,18 @@
description: Worn by dangerous people who've deconstructed stations with ease.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakCJ
name: chief justice's cloak
description: A hefty cloak adorned with a modest insignia and grand fur trim.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi
- type: StealTarget
stealGroup: HeadCloak

13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckProsecutorbadge
name: prosecutor badge
description: A badge to show that the owner is a 'legitimate' prosecutor who passed the NT bar exam required to practice law.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
- type: TypingIndicatorClothing
proto: lawyer

Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,18 @@
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
- type: TemperatureProtection
coefficient: 0.1
coefficient: 0.1

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterChiefJustice
name: chief justice's robes
description: Heavy black robes with magenta and gold trim. It smells old.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
- type: TemperatureProtection
coefficient: 0.1

Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@
Heat: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9

- type: entity
parent: ClothingOuterBase
id: ClothingOuterClerkVest
name: clerk's vest
description: a silken magenta vest with a pocket to put your notary stamp.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,38 @@
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtChiefJustice
name: chief justice's jumpskirt
description: A fancy black jumpskirt with a lace cravat to make it even more fancy. Proper judicial attire.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniform/Jumpskirt/cj.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtClerk
name: clerk's dress skirt
description: A modest dress skirt for the person with the power to notarize anything.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtProsecutor
name: prosecutor's dress skirt
description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,50 @@
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChiefJustice
name: chief justice's jumpsuit
description: A fancy black jumpsuit with a lace cravat to make it even more fancy. Proper judicial attire.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChiefJusticeFormal
name: chief justice's formal jumpsuit
description: A fancy double-breasted suit with golden accoutrements. Sharp and authoritative.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChiefJusticeWhite
name: chief justice's white jumpsuit
description: A modest, white office shirt with hard-earned rank epaulets.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitClerk
name: clerk's suit
description: A modest suit for the person with the power to notarize anything.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChemShirt
Expand All @@ -254,3 +298,15 @@
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitProsecutor
name: prosecutor's suit
description: A red suit with a fancy cravat. Perfect for a prosecutor.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi

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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Spritework by leonardo_dabepis (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "sprites by leonardo_dabepis (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "sprites by leonardo_dabepis (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "sprites by leonardo_dabepis (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "sprites by leonardo_dabepis (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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 e1f73d6

Please sign in to comment.