From 4a879f7c953e75ea7701f030c10d87a5784f01d0 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 21 Oct 2023 02:07:35 +0300 Subject: [PATCH] Balance changes. (#449) * Hop, cap * Belts and stuff * Update heads.yml * Update head_of_personnel.yml * Fix --- .../Fills/Backpacks/StarterGear/backpack.yml | 6 ++++++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 6 ++++++ .../Fills/Backpacks/StarterGear/satchel.yml | 6 ++++++ .../Catalog/Fills/Lockers/heads.yml | 15 +++++++------ .../Clothing/Belt/base_clothingbelt.yml | 4 ++-- .../Prototypes/Roles/Jobs/Command/captain.yml | 21 +++++++++++-------- .../Roles/Jobs/Command/head_of_personnel.yml | 7 +++++++ .../_NF/Entities/Clothing/Belt/belts.yml | 3 +-- 8 files changed, 47 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 02ad1c5a325..e1b094d1507 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -93,6 +93,10 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton + - id: RubberStampHop + - id: DoorRemoteService + - id: AccessConfigurator + - id: PhoneInstrument - type: entity noSpawn: true @@ -126,6 +130,8 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol + - id: RubberStampHos + - id: DoorRemoteSecurity - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 355e2a1aff3..0cc96386cad 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -102,6 +102,10 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton + - id: RubberStampHop + - id: DoorRemoteService + - id: AccessConfigurator + - id: PhoneInstrument - type: entity noSpawn: true @@ -135,6 +139,8 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol + - id: RubberStampHos + - id: DoorRemoteSecurity - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index bdedcd69a12..333f7f5a242 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -116,6 +116,10 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton + - id: RubberStampHop + - id: DoorRemoteService + - id: AccessConfigurator + - id: PhoneInstrument - type: entity noSpawn: true @@ -149,6 +153,8 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol + - id: RubberStampHos + - id: DoorRemoteSecurity - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 46bf10e0ecb..8f7fc0284b5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -114,16 +114,15 @@ prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. # Yes they do fuck you. - - id: DoorRemoteService +# - id: DoorRemoteService - id: ClothingNeckGoldmedal - - id: RubberStampHop +# - id: RubberStampHop - id: BoxEncryptionKeyPassenger - id: BoxEncryptionKeyService - id: ClothingBackpackIan # prob: 0.5 - - id: AccessConfigurator +# - id: AccessConfigurator - id: MedalCase - - id: PhoneInstrument # - id: JetpackCaptainFilled #TODO replace with new item! # - id: ClothingBeltSheathFilled #TODO replace with new item! # - id: ClothingHandsGlovesCaptain #TODO replace with new item! @@ -321,10 +320,10 @@ - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 - - id: DoorRemoteSecurity +# - id: DoorRemoteSecurity - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - - id: RubberStampHos +# - id: RubberStampHos - id: SecurityTechFabCircuitboard - id: JetpackSecurityFilled - id: BoxEncryptionKeySecurity @@ -352,10 +351,10 @@ - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 - - id: DoorRemoteSecurity +# - id: DoorRemoteSecurity - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - - id: RubberStampHos +# - id: RubberStampHos - id: SecurityTechFabCircuitboard - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index b37d3fd9745..9e1a9d1d06f 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -14,7 +14,7 @@ materialComposition: Cloth: 50 - type: StaticPrice - price: 25 + price: 20 - type: entity abstract: true @@ -22,7 +22,7 @@ id: ClothingBeltStorageBase components: - type: Storage - capacity: 40 + capacity: 45 - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 1f1e4221e11..fb6413abf25 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -29,14 +29,16 @@ joinNotifyCrew: true supervisors: job-supervisors-centcom canBeAntag: false - accessGroups: - - AllAccess - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff + access: + - Captain # Just making sure in the case of any error that this role cannot be used for any bad doing. + # accessGroups: + # - AllAccess + # special: + # - !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + # - !type:AddComponentSpecial + # components: + # - type: CommandStaff - type: startingGear id: CaptainGear @@ -49,7 +51,8 @@ gloves: ClothingHandsGlovesCaptain outerClothing: ClothingOuterArmorCaptainCarapace id: CaptainPDA - ears: ClothingHeadsetAltCommand + # ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetGrey innerClothingSkirt: ClothingUniformJumpskirtCaptain satchel: ClothingBackpackSatchelCaptainFilled duffelbag: ClothingBackpackDuffelCaptainFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index b307eff9233..bfdfd59f49c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -38,6 +38,13 @@ - Cargo - Atmospherics - Medical + - EmergencyShuttleRepealAll + - Captain + - ChiefEngineer + - ChiefMedicalOfficer +# - HeadOfSecurity Whitelist for sheriff only. + - ResearchDirector + - Armory special: - !type:AddImplantSpecial implants: [ MindShieldImplant, TrackingImplant ] diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml index 39660c6077d..9bbffaa61f6 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -8,5 +8,4 @@ sprite: _NF/Clothing/Belt/arcadia-webbing.rsi - type: Clothing sprite: _NF/Clothing/Belt/arcadia-webbing.rsi - - type: Storage - capacity: 60 +