diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 229f12ab83..a0f17e0e37 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -17,25 +17,3 @@ prob: 0.8 - id: SurvivalKnife - id: WeaponProtoKineticAccelerator - -- type: entity - id: LockerCargoTechnicianFilled - suffix: Filled - parent: LockerCargoTechnician - components: - - type: StorageFill - contents: - - id: ClothingHeadHatCargosoft - amount: 1 - - id: ClothingUniformJumpsuitCargo - amount: 1 - - id: ClothingBackpack - amount: 1 - - id: ClothingShoesColorBlack - amount: 1 - - id: ClothingUniformJumpskirtCargo - amount: 1 - - id: ClothingHandsGlovesFingerless - amount: 1 - - id: AppraisalTool - amount: 1 diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 80bc47688e..afd22fa887 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -221,6 +221,7 @@ requiredTechnologies: - BasicResearch unlockedRecipes: + - AppraisalTool - ConveyorBeltAssembly - RCD - RCDAmmo diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 77d26586e6..0dd0759182 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -168,6 +168,7 @@ - CableMVStack - CableHVStack - ConveyorBeltAssembly + - AppraisalTool - RCDAmmo - HydroponicsToolScythe - HydroponicsToolHatchet diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index cc60b61ad1..6e1bfd514a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -49,21 +49,6 @@ - type: AccessReader access: [["Salvage"]] -- type: entity - id: LockerCargoTechnician - parent: LockerBase - name: cargo technician's equipment - description: All the basics for a Cargonian resident. - components: - - type: Appearance - visuals: - - type: StorageVisualizer - state: cargo - state_open: cargo_open - state_closed: cargo_door - - type: AccessReader - access: [["Cargo"]] - # Command - type: entity id: LockerCaptain diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml index 5ebce40fbd..be2e708e2d 100644 --- a/Resources/Prototypes/Recipes/Lathes/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml @@ -8,3 +8,13 @@ materials: Steel: 500 Plastic: 50 + +- type: latheRecipe + id: AppraisalTool + icon: + sprite: Objects/Tools/appraisal-tool.rsi + state: icon + result: AppraisalTool + completetime: 4 + materials: + Steel: 500 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 90145db641..210b409704 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -19,6 +19,7 @@ shoes: ClothingShoesColorBlack id: CargoPDA ears: ClothingHeadsetCargo + pocket1: AppraisalTool innerclothingskirt: ClothingUniformJumpskirtCargo satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 6bb5cdbb8b..e10359c912 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -31,6 +31,7 @@ shoes: ClothingShoesColorBrown id: QuartermasterPDA ears: ClothingHeadsetQM + pocket1: AppraisalTool innerclothingskirt: ClothingUniformJumpskirtQM satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled