From 59e1c9faccd0c6924609bb4bf80a988bd7d975b6 Mon Sep 17 00:00:00 2001 From: Esco Date: Wed, 29 Jan 2025 09:14:43 +1000 Subject: [PATCH 1/3] =?UTF-8?q?=D1=81=D0=BD=D0=BE=D1=81=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=80=D0=BD=D0=B8=D1=87=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Lust/Roles/Jobs/Command/commaid.yml | 90 +++++++++---------- Resources/Prototypes/_Sunrise/Maps/bagel.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/box.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/cog.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/delta.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/fland.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/meta.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/oasis.yml | 2 +- .../Prototypes/_Sunrise/Maps/planet_delta.yml | 2 +- Resources/Prototypes/_Sunrise/Maps/train.yml | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Resources/Prototypes/_Lust/Roles/Jobs/Command/commaid.yml b/Resources/Prototypes/_Lust/Roles/Jobs/Command/commaid.yml index 088f776071..5ceef3de1d 100644 --- a/Resources/Prototypes/_Lust/Roles/Jobs/Command/commaid.yml +++ b/Resources/Prototypes/_Lust/Roles/Jobs/Command/commaid.yml @@ -1,47 +1,47 @@ -- type: job - id: ComMaid - name: job-name-commaid - description: job-description-commaid - playTimeTracker: JobComMaid - requirements: - - !type:RoleTimeRequirement - role: JobJanitor - time: 36000 - - !type:DepartmentTimeRequirement - department: Command - time: 12000 - startingGear: ComMaidGear - icon: "JobIconComMaid" - supervisors: job-supervisors-captain - antagAdvantage: 20 - displayWeight: 0 - weight: 5 - access: - - Command - - Service - - Janitor - - Hydroponics - - Kitchen - - Bar - - Theatre - - Maintenance +#- type: job +# id: ComMaid + # name: job-name-commaid + # description: job-description-commaid + # playTimeTracker: JobComMaid + # requirements: + # - !type:RoleTimeRequirement + # role: JobJanitor + # time: 36000 + # - !type:DepartmentTimeRequirement + # department: Command + # time: 12000 + # startingGear: ComMaidGear + # icon: "JobIconComMaid" + # supervisors: job-supervisors-captain + # antagAdvantage: 20 + # displayWeight: 0 + # weight: 5 + # access: + # - Command + # - Service + # - Janitor + # - Hydroponics + # - Kitchen + # - Bar + # - Theatre + # - Maintenance -- type: startingGear - id: ComMaidGear - equipment: - jumpsuit: ClothingUniformJumpskirtElegantMaid - neck: BunnyButterfly - head: ClothingHeadNurseHat - eyes: ClothingEyesGlassesSunglasses - gloves: ClothingHandsGlovesLatex - shoes: BunnyShoesFilled - back: ClothingBackpackSatchelLeather - id: CommaidPDA - ears: ClothingHeadsetCommaid +#- type: startingGear +# id: ComMaidGear +# equipment: +# jumpsuit: ClothingUniformJumpskirtElegantMaid +# neck: BunnyButterfly +# head: ClothingHeadNurseHat +# eyes: ClothingEyesGlassesSunglasses +# gloves: ClothingHandsGlovesLatex +# shoes: BunnyShoesFilled +# back: ClothingBackpackSatchelLeather +# id: CommaidPDA +# ears: ClothingHeadsetCommaid -- type: jobIcon - parent: JobIcon - id: JobIconComMaid - icon: - sprite: /Textures/_Lust/Interface/Misc/job_icons.rsi - state: commaid +#- type: jobIcon +# parent: JobIcon +# id: JobIconComMaid +# icon: +# sprite: /Textures/_Lust/Interface/Misc/job_icons.rsi +# state: commaid diff --git a/Resources/Prototypes/_Sunrise/Maps/bagel.yml b/Resources/Prototypes/_Sunrise/Maps/bagel.yml index 96781d1a7b..a878449d2c 100644 --- a/Resources/Prototypes/_Sunrise/Maps/bagel.yml +++ b/Resources/Prototypes/_Sunrise/Maps/bagel.yml @@ -92,7 +92,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index 1c020ec898..febed0392b 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -91,7 +91,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/cog.yml b/Resources/Prototypes/_Sunrise/Maps/cog.yml index 2ba41bd9a9..df290d7984 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cog.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cog.yml @@ -89,7 +89,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index b10093a79b..e0e2f3a2e2 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -91,5 +91,5 @@ PeaceBorg: [ 2, 2 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index b6ba13af12..a2b66fd3b4 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -91,7 +91,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/meta.yml b/Resources/Prototypes/_Sunrise/Maps/meta.yml index 79df4e3cb8..2c06a9422e 100644 --- a/Resources/Prototypes/_Sunrise/Maps/meta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/meta.yml @@ -91,7 +91,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/oasis.yml b/Resources/Prototypes/_Sunrise/Maps/oasis.yml index 48a09a1651..68d7828d1d 100644 --- a/Resources/Prototypes/_Sunrise/Maps/oasis.yml +++ b/Resources/Prototypes/_Sunrise/Maps/oasis.yml @@ -89,7 +89,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/planet_delta.yml b/Resources/Prototypes/_Sunrise/Maps/planet_delta.yml index 3782a32926..985c86ec8c 100644 --- a/Resources/Prototypes/_Sunrise/Maps/planet_delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/planet_delta.yml @@ -91,7 +91,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: diff --git a/Resources/Prototypes/_Sunrise/Maps/train.yml b/Resources/Prototypes/_Sunrise/Maps/train.yml index d4bcd35e63..ce75929423 100644 --- a/Resources/Prototypes/_Sunrise/Maps/train.yml +++ b/Resources/Prototypes/_Sunrise/Maps/train.yml @@ -92,7 +92,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: From f53ad8bc44bd2a928ac4d603f2c99a5d5e0653bd Mon Sep 17 00:00:00 2001 From: Esco Date: Wed, 29 Jan 2025 09:28:56 +1000 Subject: [PATCH 2/3] fix linter --- .../Prototypes/Roles/Jobs/departments.yml | 2 +- .../Objects/Misc/identification_cards.yml | 24 +++++++++---------- .../Prototypes/_Sunrise/Maps/marathon.yml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d16ff1f719..0a56e8d87c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -76,7 +76,7 @@ - CentCommOfficial - NanoTrasenRepresentative #Sunrise-Edit - Adjutant #Sunrise-edit - - ComMaid # Sunrise-Lust edit + # - ComMaid # Sunrise-Lust edit primary: false weight: 100 diff --git a/Resources/Prototypes/_Lust/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Lust/Entities/Objects/Misc/identification_cards.yml index 8ae6b82b3b..2e8fde9761 100644 --- a/Resources/Prototypes/_Lust/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Lust/Entities/Objects/Misc/identification_cards.yml @@ -1,12 +1,12 @@ -- type: entity - parent: IDCardStandard - id: CommaidIDCard - name: Commaid ID card - components: - - type: Sprite - sprite: _Lust/Objects/Misc/id_cards.rsi - layers: - - state: silver - - state: idcommaid - - type: PresetIdCard - job: ComMaid +#- type: entity +# parent: IDCardStandard +# id: CommaidIDCard +# name: Commaid ID card +# components: +# - type: Sprite +# sprite: _Lust/Objects/Misc/id_cards.rsi +# layers: +# - state: silver +# - state: idcommaid +# - type: PresetIdCard +# job: ComMaid diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index 0b07c96380..b68e3067d0 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -91,7 +91,7 @@ MedicalBorg: [ 4, 4 ] SecurityBorg: [ 4, 4 ] # Lust-start - ComMaid: [ 1, 1 ] + # ComMaid: [ 1, 1 ] # Lust-end - type: StationGoal goals: From 1fa3690edeb4040108aaf40d47c62f92150e49a6 Mon Sep 17 00:00:00 2001 From: Esco Date: Wed, 29 Jan 2025 09:34:24 +1000 Subject: [PATCH 3/3] fix2 --- .../_Lust/Entities/Objects/Devices/pda.yml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_Lust/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Lust/Entities/Objects/Devices/pda.yml index 51c7887088..461a429bc5 100644 --- a/Resources/Prototypes/_Lust/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Lust/Entities/Objects/Devices/pda.yml @@ -1,16 +1,16 @@ -- type: entity - parent: BasePDA - id: CommaidPDA - name: Command maid PDA - components: - - type: Sprite - - type: Pda - id: CommaidIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-commaid - - type: Icon - sprite: _Lust/Objects/Devices/pda.rsi - state: pda-commaid +#- type: entity +# parent: BasePDA +# id: CommaidPDA +# name: Command maid PDA +# components: +# - type: Sprite +# - type: Pda +# id: CommaidIDCard +# - type: Appearance +# appearanceDataInit: +# enum.PdaVisuals.PdaType: +# !type:String +# pda-commaid +# - type: Icon +# sprite: _Lust/Objects/Devices/pda.rsi +# state: pda-commaid