diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl index b92f56bc7cb..c2ec9a1c847 100644 --- a/Resources/Locale/en-US/loadouts/items.ftl +++ b/Resources/Locale/en-US/loadouts/items.ftl @@ -13,3 +13,25 @@ loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plu loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station. This device translates Sol Common speech into Galactic Common. +loadout-name-LoadoutItemPapers = papers (x4) +loadout-description-LoadoutItemPapers = four pieces of paper, good for filling out tedious paperwork and silent communication. +loadout-description-LoadoutItemBoxFolderGrey = A folder to store papers and top secret documents. +loadout-description-LoadoutBookRandom = A notebook with a random cover. Can be used as a diary, or for writing fanfiction drafts for SpacePad. +loadout-description-LoadoutPen = An extra pen, just in case your pen from your PDA gets robbed by skeletal space pirates. +loadout-description-LoadoutItemLunchboxGenericFilledRandom = Packed with love. + This is only useful when the chefs are either a.) nonexistent or b.) not doing their job. + In conclusion, this lunchbox is useful most of the time. +loadout-description-LoadoutHandLabeler = A hand labeler, used to label items and objects. + It's not really recommended to use this to label a fuel tank with "SOLUTION TO CLOWN PROBLEM". +loadout-description-LoadoutEmergencyMedipen = A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. + WARNING: injecting two emergency medipens at once will cause an epinephrine overdose. +loadout-description-LoadoutSpaceMedipen = Contains a mix of chemicals that protect you from the deadly effects of space. + Also known as the "poor man's hardsuit". + WARNING: injecting two space medipens at once will cause a barozine overdose. + +loadout-name-LoadoutItemBoxSurvival = survival box (standard) +loadout-name-LoadoutItemBoxSurvivalEngineering = extended-capacity survival box (engineering) +loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security) +loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman) +loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical) +loadout-name-LoadoutItemBoxHug = box of hugs (clown) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 99021b47e42..8a0a500e6fa 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -45,8 +45,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSuitBlackMob - name: mobster's attire - description: A crisp red shirt and charcoal slacks. Reminds you of your debts. + name: red suit + description: A crisp red shirt and charcoal slacks. Reminds you of law enforcement. components: - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi @@ -67,7 +67,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSuitBrownAlt - name: suspicious suit + name: dubious suit description: A crisp grey shirt and chocolate slacks. Reminds you of clandestine operators. components: - type: Sprite @@ -78,8 +78,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSuitBrownMob - name: gangster's attire - description: A crisp red shirt and chocolate slacks. Reminds you of drivebys. + name: mafioso suit + description: A crisp red shirt and chocolate slacks. Reminds you of family. components: - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi @@ -111,8 +111,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSuitWhiteMob - name: mafioso's attire - description: A crisp red shirt and ivory slacks. Reminds you of family. + name: gangster suit + description: A crisp red shirt and ivory slacks. Reminds you of organized Japanese crime. components: - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index c78a5f9bdb5..a47a2bbcebc 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -66,8 +66,8 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatInspector - name: inspector's coat - description: A strict inspector's coat for being intimidating during inspections. + name: slim trench coat + description: A slim minimalist trench coat best worn unbuttoned. components: - type: Sprite sprite: Clothing/OuterClothing/Coats/insp_coat.rsi diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml index 75c0461c106..e09d02c463a 100644 --- a/Resources/Prototypes/Loadouts/items.yml +++ b/Resources/Prototypes/Loadouts/items.yml @@ -63,11 +63,18 @@ - CheapLighter - type: loadout - id: LoadoutItemMatches + id: LoadoutItemLighterFlippo category: Items - cost: 1 + cost: 3 + items: + - FlippoLighter + +- type: loadout + id: LoadoutItemSmokingPipeFilledTobacco + category: Items + cost: 2 items: - - Matchbox + - SmokingPipeFilledTobacco # Instruments - type: loadout @@ -176,6 +183,13 @@ items: - DoubleEmergencyOxygenTankFilled +- type: loadout + id: LoadoutItemClothingMaskBreath + category: Items + cost: 1 + items: + - ClothingMaskBreath + - type: loadout id: LoadoutItemsEmergencyCrowbar category: Items @@ -190,6 +204,82 @@ items: - FireExtinguisher +- type: loadout + id: LoadoutItemFlashlightLantern + category: Items + cost: 2 + items: + - FlashlightLantern + +- type: loadout + id: LoadoutItemFlare + category: Items + cost: 1 + items: + - Flare + +- type: loadout + id: LoadoutEmergencyMedipen + category: Items + cost: 1 + items: + - EmergencyMedipen + +- type: loadout + id: LoadoutSpaceMedipen + category: Items + cost: 1 + items: + - SpaceMedipen + +# Paperwork +- type: loadout + id: LoadoutItemPapers + category: Items + cost: 1 + items: + - Paper + - Paper + - Paper + - Paper + +- type: loadout + id: LoadoutItemBoxFolderGrey + category: Items + cost: 1 + items: + - BoxFolderGrey + +- type: loadout + id: LoadoutBookRandom + category: Items + cost: 1 + items: + - BookRandom + +- type: loadout + id: LoadoutPen + category: Items + cost: 1 + items: + - Pen + +# Food and drink +- type: loadout + id: LoadoutDrinkWaterBottleFull + category: Items + cost: 1 + items: + - DrinkWaterBottleFull + +- type: loadout + id: LoadoutItemLunchboxGenericFilledRandom + category: Items + cost: 3 + items: + - LunchboxGenericFilledRandom + +# Survival boxes - type: loadout id: LoadoutItemBoxSurvival category: Items @@ -230,6 +320,10 @@ - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterJobRequirement + inverted: true + jobs: + - Brigmedic - type: loadout id: LoadoutItemBoxSurvivalBrigmedic @@ -264,6 +358,116 @@ jobs: - Clown +# Medkits +- type: loadout + id: LoadoutMedkitFilled + category: Items + cost: 4 + items: + - MedkitFilled + +- type: loadout + id: LoadoutMedkitBruteFilled + category: Items + cost: 4 + items: + - MedkitBruteFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitBurnFilled + category: Items + cost: 4 + items: + - MedkitBurnFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitToxinFilled + category: Items + cost: 4 + items: + - MedkitToxinFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitOxygenFilled + category: Items + cost: 4 + items: + - MedkitOxygenFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitRadiationFilled + category: Items + cost: 4 + items: + - MedkitRadiationFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitAdvancedFilled + category: Items + cost: 5 + items: + - MedkitAdvancedFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - MedicalDoctor + - Paramedic + - ChiefMedicalOfficer + - MedicalIntern + - Brigmedic + +- type: loadout + id: LoadoutMedkitCombatFilled + category: Items + cost: 4 # Discounted for the CMO and Corpsman + items: + - MedkitCombatFilled + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + - Brigmedic + #Misc Items - type: loadout id: LoadoutItemPAI @@ -316,3 +520,10 @@ cost: 3 items: - SolCommonTranslator + +- type: loadout + id: LoadoutHandLabeler + category: Items + cost: 3 + items: + - HandLabeler diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml index 38ba17b6a3b..da091412b6c 100644 --- a/Resources/Prototypes/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Loadouts/outerClothing.yml @@ -225,3 +225,17 @@ cost: 3 items: - ClothingOuterCoatGentle + +- type: loadout + id: LoadoutOuterCoatInspector + category: Outer + cost: 3 + items: + - ClothingOuterCoatInspector + +- type: loadout + id: LoadoutOuterCoatOvercoat + category: Outer + cost: 4 + items: + - ClothingOuterCoatOvercoat diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 090a0957a92..5843cb30ee5 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -1360,3 +1360,159 @@ inverted: true departments: - Command + +# Suits +- type: loadout + id: LoadoutClothingJumpsuitSuitBlack + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBlack + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitBlackAlt + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBlackAlt + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitBlackMob + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBlackMob + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitBrown + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBrown + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + - Security + +- type: loadout + id: LoadoutClothingJumpsuitSuitBrownAlt + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBrownAlt + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitBrownMob + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitBrownMob + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitWhite + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitWhite + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + - Security + +- type: loadout + id: LoadoutClothingJumpsuitSuitWhiteAlt + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitWhiteAlt + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command + +- type: loadout + id: LoadoutClothingJumpsuitSuitWhiteMob + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformJumpsuitSuitWhiteMob + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Harpy + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Command