diff --git a/Resources/Maps/Shuttles/condor.yml b/Resources/Maps/Shuttles/condor.yml index 1c258fb5b37..0c1b4f68525 100644 --- a/Resources/Maps/Shuttles/condor.yml +++ b/Resources/Maps/Shuttles/condor.yml @@ -2468,17 +2468,6 @@ entities: - pos: 3.5,0.5 parent: 281 type: Transform -- proto: ClothingBeltChiefEngineerFilled - entities: - - uid: 669 - components: - - flags: InContainer - type: MetaData - - parent: 668 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ClothingHandsGlovesCaptain entities: - uid: 674 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index a55a0c2918f..e7ba13ecec3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -11,10 +11,11 @@ - id: ClothingShoesBootsMag - id: ClothingMaskGasExplorer # Currently do not function as 'true' mesons, so they're useless for salvagers. -# - id: ClothingEyesGlassesMeson - - id: ClothingBeltUtilityFilled + - id: ClothingEyesGlassesMeson # Frontier +# - id: ClothingBeltUtilityFilled # Frontier + - id: ClothingBeltUtilityEngineering # Frontier - id: SurvivalKnife - - id: HandheldGPSBasic +# - id: HandheldGPSBasic # Frontier - id: RadioHandheld - id: OreBag - id: Flare @@ -28,10 +29,11 @@ - type: StorageFill contents: # Currently do not function as 'true' mesons, so they're useless for salvagers. -# - id: ClothingEyesGlassesMeson - - id: ClothingBeltUtilityFilled + - id: ClothingEyesGlassesMeson # Frontier +# - id: ClothingBeltUtilityFilled # Frontier + - id: ClothingBeltUtilityEngineering # Frontier - id: SurvivalKnife - - id: HandheldGPSBasic +# - id: HandheldGPSBasic # Frontier - id: RadioHandheld - id: OreBag - id: Flare diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a62d14cf2a4..4f3e45a22a1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -24,6 +24,9 @@ - id: RubberStampQm - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo + - id: ClothingNeckMantleQM # Frontier + - id: ClothingOuterWinterQM # Frontier + - id: ClothingBeltUtilityEngineering # Frontier - type: entity id: LockerCaptainFilledHardsuit @@ -56,7 +59,7 @@ - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain # - id: WeaponAntiqueLaser # Frontier - - id: JetpackCaptainFilled +# - id: JetpackCaptainFilled # Frontier - id: ClothingHeadHatCapcap # - id: MedalCase # Frontier @@ -89,7 +92,7 @@ - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain # - id: WeaponAntiqueLaser # Frontier - - id: JetpackCaptainFilled +# - id: JetpackCaptainFilled # Frontier # - id: MedalCase # Frontier - id: ClothingHeadHatCapcap @@ -147,18 +150,21 @@ - id: NitrogenTankFilled - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled +# - id: ClothingBeltChiefEngineerFilled # Frontier + - id: ClothingBeltUtilityEngineering # Frontier - id: ClothingHeadHatBeretEngineering - - id: ClothingShoesBootsMagAdv +# - id: ClothingShoesBootsMagAdv # Frontier + - id: ClothingShoesBootsMag # Frontier - id: ClothingHandsGlovesColorYellow - id: CigarCase prob: 0.15 # - id: DoorRemoteEngineering # Frontier - id: RubberStampCE - - id: JetpackVoidFilled +# - id: JetpackVoidFilled # Frontier - id: ClothingHeadsetAltEngineering - id: BoxEncryptionKeyEngineering # - id: AccessConfigurator # Frontier + - id: ClothingNeckMantleCE # Frontier - type: entity id: LockerChiefEngineerFilled @@ -169,7 +175,8 @@ contents: - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled +# - id: ClothingBeltChiefEngineerFilled # Frontier + - id: ClothingBeltUtilityEngineering # Frontier - id: ClothingHeadHatBeretEngineering - id: ClothingHandsGlovesColorYellow - id: ClothingUniformJumpsuitChiefEngineerTurtle @@ -181,6 +188,8 @@ - id: ClothingHeadsetAltEngineering - id: BoxEncryptionKeyEngineering # - id: AccessConfigurator # Frontier + - id: ClothingNeckMantleCE # Frontier + - id: ClothingOuterWinterCE # Frontier - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -207,6 +216,7 @@ - id: MaterialBiomass amount: 3 - id: BoxEncryptionKeyMedical + - id: ClothingNeckMantleCMO # Frontier - type: entity id: LockerChiefMedicalOfficerFilled @@ -234,6 +244,8 @@ - id: MaterialBiomass amount: 3 - id: BoxEncryptionKeyMedical + - id: ClothingNeckMantleCMO # Frontier + - id: ClothingOuterWinterCMO # Frontier - type: entity id: LockerResearchDirectorFilledHardsuit @@ -251,10 +263,13 @@ # - id: HandTeleporter # Frontier # - id: DoorRemoteResearch # Frontier - id: ClothingHeadHatBeretRND + - id: ClothingHandsGlovesColorPurple # Frontier - id: RubberStampRd - id: ClothingHeadsetAltScience - id: BoxEncryptionKeyScience - id: BoxEncryptionKeyRobo + - id: ClothingBeltUtilityEngineering # Frontier + - id: ClothingNeckMantleRD # Frontier - type: entity id: LockerResearchDirectorShuttleFilled @@ -273,10 +288,13 @@ # - id: DoorRemoteResearch # Frontier - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - - id: ClothingBeltUtilityFilled + - id: ClothingBeltUtilityEngineering # Frontier - id: RubberStampRd - id: ClothingHeadsetAltScience - id: BoxEncryptionKeyScience + - id: BoxEncryptionKeyRobo # Frontier + - id: ClothingNeckMantleRD # Frontier + - id: ClothingOuterWinterRD # Frontier - type: entity id: LockerResearchDirectorFilled @@ -294,10 +312,13 @@ # - id: DoorRemoteResearch # Frontier - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - - id: ClothingBeltUtilityFilled + - id: ClothingBeltUtilityEngineering # Frontier - id: RubberStampRd - id: ClothingHeadsetAltScience - id: BoxEncryptionKeyScience + - id: BoxEncryptionKeyRobo # Frontier + - id: ClothingNeckMantleRD # Frontier + - id: ClothingOuterWinterRD # Frontier - type: entity id: LockerHeadOfSecurityFilledHardsuit @@ -327,9 +348,11 @@ - id: ClothingUniformJumpsuitHosFormal # - id: RubberStampHos # Frontier - id: SecurityTechFabCircuitboard - - id: JetpackSecurityFilled +# - id: JetpackSecurityFilled # Frontier - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity + - id: ClothingNeckMantleHOS # Frontier + - id: CrowbarRed # Frontier - type: entity id: LockerHeadOfSecurityFilled @@ -360,3 +383,6 @@ - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity # - id: BookSecretDocuments # Frontier + - id: ClothingNeckMantleHOS # Frontier + - id: ClothingOuterWinterHoS # Frontier + - id: CrowbarRed # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index cec466c9d03..a2711ec1586 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -128,8 +128,8 @@ components: - type: StorageFill contents: - - id: ClothingHeadHelmetVoidParamed - - id: ClothingOuterHardsuitVoidParamed +# - id: ClothingHeadHelmetVoidParamed # Frontier +# - id: ClothingOuterHardsuitVoidParamed # Frontier - id: ClothingOuterCoatParamedicWB - id: ClothingHeadHatParamedicsoft - id: ClothingUniformJumpsuitParamedic diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index cea5c6978a6..f7179a90f15 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -22,6 +22,7 @@ - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity + - id: CrowbarRed # Frontier - type: entity id: LockerWardenFilled @@ -46,6 +47,7 @@ # - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity + - id: CrowbarRed # Frontier - type: entity id: LockerSecurityFilled @@ -68,6 +70,7 @@ - id: WeaponMeleeNeedle prob: 0.1 - id: ClothingEyesHudSecurity + - id: CrowbarRed # Frontier - type: entity id: LockerDetectiveFilled @@ -86,6 +89,7 @@ - id: BoxForensicPad - id: DrinkDetFlask - id: ClothingHandsGlovesForensic + - id: CrowbarRed # Frontier - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 8fc23d64da5..7428f8141a8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -12,6 +12,8 @@ - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVA - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier #Basic EVA (Big Ass Helmet) - type: entity @@ -26,6 +28,8 @@ - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVALarge - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier #Emergency EVA - type: entity @@ -39,6 +43,8 @@ - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier #Prisoner EVA - type: entity @@ -67,6 +73,8 @@ - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate - id: ClothingMaskGasSyndicate + - id: JetpackBlackFilled # Frontier + - id: HandheldGPSBasic # Frontier #Pirate EVA - type: entity @@ -80,6 +88,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas + - id: JetpackBlackFilled # Frontier + - id: HandheldGPSBasic # Frontier #NTSRA Voidsuit - type: entity @@ -93,6 +103,8 @@ - id: ClothingOuterHardsuitAncientEVA - id: ClothingHeadHelmetAncient - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier #HARDSUITS #Basic hardsuit @@ -107,6 +119,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitBasic - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier #Engineering hardsuit - type: entity @@ -121,6 +135,8 @@ - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["Engineering"]] # Frontier @@ -136,6 +152,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["Atmospherics"]] # Frontier @@ -155,6 +173,7 @@ orGroup: HardsuitSecurity - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader access: [["Security"]] @@ -168,10 +187,13 @@ contents: - id: NitrogenTankFilled - id: OxygenTankFilled - - id: JetpackVoidFilled - - id: ClothingShoesBootsMagAdv +# - id: JetpackVoidFilled # Frontier +# - id: ClothingShoesBootsMagAdv # Frontier + - id: ClothingShoesBootsMag # Frontier - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["ChiefEngineer"]] # Frontier @@ -187,6 +209,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitMedical - id: ClothingMaskBreathMedical + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [ [ "ChiefMedicalOfficer" ] ] # Frontier @@ -202,6 +226,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitRd - id: ClothingMaskBreath + - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [ [ "ResearchDirector" ] ] # Frontier @@ -218,6 +244,7 @@ - id: JetpackSecurityFilled - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat + - id: HandheldGPSBasic # Frontier - type: AccessReader access: [["HeadOfSecurity"]] @@ -234,6 +261,7 @@ - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath - id: JetpackSecurityFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader access: [["Armory"]] @@ -249,6 +277,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain + - id: JetpackCaptainFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["Captain"]] # Frontier @@ -266,6 +296,7 @@ - id: ClothingOuterHardsuitSpatio - id: ClothingMaskGasExplorer - id: JetpackMiniFilled # Frontier + - id: HandheldGPSBasic # Frontier - type: AccessReader # access: [["Salvage"]] # Frontier @@ -282,8 +313,8 @@ - id: ClothingOuterHardsuitSyndie - id: ClothingShoesBootsMagSyndie - id: ClothingMaskGasSyndicate - - type: StaticPrice - price: 75 + - id: JetpackBlackFilled # Frontier + - id: HandheldGPSBasic # Frontier #Pirate Captain's hardsuit - type: entity @@ -297,6 +328,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateCap - id: ClothingMaskGas + - id: JetpackBlackFilled # Frontier + - id: HandheldGPSBasic # Frontier #Wizard - type: entity @@ -310,3 +343,5 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath + - id: JetpackBlackFilled # Frontier + - id: HandheldGPSBasic # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 02d66c06bf7..52f3cd17c14 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -69,6 +69,7 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMag + - ClothingShoesBootsMagAdv # Frontier # Tier 2 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index fc22bd8f363..a64c01a8b4e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -30,6 +30,7 @@ prob: 0.7 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 + - id: CrowbarRed # Frontier - type: entity id: LockerBrigmedicFilled @@ -62,3 +63,4 @@ prob: 0.7 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 + - id: CrowbarRed # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index 511d69b1af1..3d0b3690546 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -12,5 +12,23 @@ - id: ClothingOuterHardsuitBrigmedic - id: ClothingMaskBreathMedicalSecurity - id: JetpackSecurityFilled + - id: HandheldGPSBasic - type: AccessReader access: [["Security"]] + +#Paramedic's hardsuit +- type: entity + id: SuitStorageParamedic + parent: SuitStorageBase + suffix: Paramedic + components: + - type: StorageFill + contents: + - id: NitrogenTankFilled + - id: OxygenTankFilled + - id: ClothingHeadHelmetVoidParamed + - id: ClothingOuterHardsuitVoidParamed + - id: ClothingMaskBreathMedical + - id: JetpackMiniFilled + - id: HandheldGPSBasic + - type: AccessReader diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml new file mode 100644 index 00000000000..4fade7a37f5 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -0,0 +1,7 @@ +- type: latheRecipe + id: ClothingShoesBootsMagAdv + result: ClothingShoesBootsMagAdv + completetime: 12 + materials: + Silver: 1000 + Gold: 500