From 8cde6605222973e32a47edc9c879d08b28ac01d0 Mon Sep 17 00:00:00 2001 From: JunJun Date: Mon, 20 Oct 2025 12:59:44 +0300 Subject: [PATCH] Some fix and tweaks (#325) * base * Inventory remove * +fix * Laser-fix --- .../Research/UI/ResearchConsoleMenu.xaml | 6 +- .../Corvax/Loadouts/role_loadouts.yml | 14 ++-- .../Corvax/Roles/Jobs/Command/iaa.yml | 6 +- .../Corvax/Roles/Jobs/Security/brigmedic.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 4 +- .../Prototypes/Loadouts/role_loadouts.yml | 78 +++++++++---------- .../_WL/Loadouts/Miscellaneous/scarfs.yml | 20 +++++ .../_WL/Loadouts/Miscellaneous/ties.yml | 10 +++ .../Prototypes/_WL/Loadouts/role_loadouts.yml | 1 - .../_WL/Roles/Jobs/Command/adjutant.yml | 4 +- Resources/Prototypes/_WL/Species/golem.yml | 1 + Resources/Prototypes/_WL/Species/kidan.yml | 40 +++++++++- 12 files changed, 127 insertions(+), 59 deletions(-) diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml index 4d54e00507..cc4a29b485 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml @@ -8,11 +8,7 @@ - + diff --git a/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml b/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml index 96ad7f8541..926c9bc435 100644 --- a/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml @@ -2,7 +2,7 @@ - type: roleLoadout id: JobIAA groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - LawyerNeck - LawyerJumpsuit - CommonBackpack @@ -15,7 +15,7 @@ - type: roleLoadout id: JobSeniorEngineer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - SeniorEngineerHead - SeniorEngineerJumpsuit @@ -31,7 +31,7 @@ - type: roleLoadout id: JobSeniorResearcher groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - SeniorResearcherHead - SeniorResearcherJumpsuit @@ -49,7 +49,7 @@ - type: roleLoadout id: JobPilot groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - PilotHead - PilotJumpsuit - SecurityBackpack @@ -64,7 +64,7 @@ - type: roleLoadout id: JobBrigmedic groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - BrigmedicHead - BrigmedicMask - BrigmedicJumpsuit @@ -80,7 +80,7 @@ - type: roleLoadout id: JobSeniorOfficer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - SeniorOfficerHead - SeniorOfficerJumpsuit - SeniorOfficerBackpack @@ -97,7 +97,7 @@ - type: roleLoadout id: JobSeniorPhysician groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - SeniorPhysicianHead - MedicalMask diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index dd033e65fe..87e5686a65 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -55,7 +55,9 @@ equipment: head: ClothingHeadHatBowlerHat eyes: ClothingEyesGlassesSunglasses - outerClothing: ClothingUniformJumpsuitLawyerBlack - neck: ClothingNeckScarfStripedBlue + # Corvax-WL-Tweak-Start + outerClothing: ClothingOuterCoatDetectiveDark + neck: ClothingNeckLawyerbadge + # Corvax-WL-Tweak-End gloves: ClothingHandsGlovesColorWhite mask: ClothingMaskBreath diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml index f8ef7973ba..0371c1afeb 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml @@ -60,6 +60,6 @@ head: ClothingHeadHatBeretSecurityMedic eyes: ClothingEyesHudMedSec mask: ClothingMaskBreathMedicalSecurity - outerClothing: ClothingUniformJumpsuitBrigmedic #верхняя одежда + outerClothing: ClothingOuterCoatAMG #верхняя одежда # Corvax-WL-Tweak neck: ClothingNeckScarfStripedRed #шея gloves: ClothingHandsGlovesLatex # перчи diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 43b44a9f3a..b86b891c7b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -278,7 +278,7 @@ availableModes: - SemiAuto - type: HitscanBatteryAmmoProvider - proto: RedLaserPractice + proto: RedLaser # Corvax-WL-Fix fireCost: 62.5 - type: StaticPrice price: 300 @@ -292,7 +292,7 @@ - type: StaticPrice price: 420 - type: HitscanBatteryAmmoProvider - proto: RedLaser + proto: RedLaserPractice # Corvax-WL-Fix fireCost: 62.5 - type: PacifismAllowedGun # WL-Changes components Start diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index be7350ca45..48d0b6c03d 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -2,7 +2,7 @@ - type: roleLoadout id: JobCaptain groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - CaptainHead - CaptainNeck - CaptainJumpsuit @@ -16,7 +16,7 @@ - type: roleLoadout id: JobHeadOfPersonnel groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - HoPHead - HoPNeck @@ -44,7 +44,7 @@ - type: roleLoadout id: JobPassenger groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - PassengerJumpsuit - CommonBackpack @@ -62,7 +62,7 @@ - type: roleLoadout id: JobBartender groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - BartenderHead - BartenderJumpsuit @@ -77,7 +77,7 @@ - type: roleLoadout id: JobServiceWorker groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - BartenderJumpsuit - CommonBackpack @@ -90,7 +90,7 @@ - type: roleLoadout id: JobChef groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ChefHead - ChefMask @@ -106,7 +106,7 @@ - type: roleLoadout id: JobLibrarian groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - LibrarianJumpsuit - CommonBackpack @@ -119,7 +119,7 @@ - type: roleLoadout id: JobLawyer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - LawyerNeck - LawyerJumpsuit @@ -133,7 +133,7 @@ - type: roleLoadout id: JobChaplain groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ChaplainHead - ChaplainMask @@ -151,7 +151,7 @@ - type: roleLoadout id: JobJanitor groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - JanitorHead - JanitorJumpsuit @@ -168,7 +168,7 @@ - type: roleLoadout id: JobBotanist groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - BotanistHead - BotanistJumpsuit @@ -184,7 +184,7 @@ id: JobClown canCustomizeName: true groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ClownHead - ClownJumpsuit @@ -200,7 +200,7 @@ id: JobMime canCustomizeName: true groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - MimeHead - MimeMask @@ -216,7 +216,7 @@ - type: roleLoadout id: JobMusician groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - MusicianJumpsuit - CommonBackpack @@ -232,7 +232,7 @@ - type: roleLoadout id: JobQuartermaster groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - QuartermasterHead - QuartermasterNeck @@ -249,7 +249,7 @@ - type: roleLoadout id: JobCargoTechnician groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - CargoTechnicianHead - CargoTechnicianJumpsuit @@ -266,7 +266,7 @@ - type: roleLoadout id: JobSalvageSpecialist groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - SalvageSpecialistBackpack - SalvageSpecialistOuterClothing @@ -281,7 +281,7 @@ - type: roleLoadout id: JobChiefEngineer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ChiefEngineerHead - ChiefEngineerJumpsuit @@ -297,7 +297,7 @@ - type: roleLoadout id: JobTechnicalAssistant groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - TechnicalAssistantJumpsuit - StationEngineerBackpack @@ -309,7 +309,7 @@ - type: roleLoadout id: JobStationEngineer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - StationEngineerHead - StationEngineerJumpsuit @@ -325,7 +325,7 @@ - type: roleLoadout id: JobAtmosphericTechnician groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - AtmosphericTechnicianJumpsuit - AtmosphericTechnicianBackpack @@ -341,7 +341,7 @@ - type: roleLoadout id: JobResearchDirector groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ResearchDirectorHead - ResearchDirectorNeck @@ -359,7 +359,7 @@ - type: roleLoadout id: JobScientist groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ScientistHead - ScientistNeck @@ -378,7 +378,7 @@ - type: roleLoadout id: JobResearchAssistant groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ResearchAssistantJumpsuit - ScientistBackpack @@ -392,7 +392,7 @@ - type: roleLoadout id: JobHeadOfSecurity groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - HeadofSecurityHead - HeadofSecurityNeck - HeadofSecurityJumpsuit @@ -409,7 +409,7 @@ - type: roleLoadout id: JobWarden groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - WardenHead - WardenJumpsuit - SecurityBackpack @@ -425,7 +425,7 @@ - type: roleLoadout id: JobSecurityOfficer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - SecurityHead - SecurityJumpsuit - SecurityBackpack @@ -442,7 +442,7 @@ - type: roleLoadout id: JobDetective groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - DetectiveHead - DetectiveNeck - DetectiveJumpsuit @@ -458,7 +458,7 @@ - type: roleLoadout id: JobSecurityCadet groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - SecurityCadetJumpsuit - SecurityBackpack - SurvivalSecurity @@ -470,7 +470,7 @@ - type: roleLoadout id: JobChiefMedicalOfficer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ChiefMedicalOfficerHead - MedicalMask @@ -484,14 +484,14 @@ - SurvivalMedical - Trinkets - WLNeck # WL-Changes: Neck add - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - Utility # WL-Changes - GroupSpeciesBreathToolMedical - type: roleLoadout id: JobMedicalDoctor groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - MedicalDoctorHead - MedicalMask @@ -512,7 +512,7 @@ - type: roleLoadout id: JobMedicalIntern groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - MedicalInternJumpsuit - MedicalBackpack @@ -526,7 +526,7 @@ - type: roleLoadout id: JobChemist groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - MedicalMask - ChemistJumpsuit @@ -542,7 +542,7 @@ - type: roleLoadout id: JobParamedic groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ParamedicHead - MedicalMask @@ -561,7 +561,7 @@ - type: roleLoadout id: JobZookeeper groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - CommonBackpack - Glasses @@ -573,7 +573,7 @@ - type: roleLoadout id: JobReporter groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - ReporterJumpsuit - CommonBackpack @@ -586,7 +586,7 @@ - type: roleLoadout id: JobPsychologist groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - PsychologistJumpsuit - MedicalBackpack @@ -599,7 +599,7 @@ - type: roleLoadout id: JobBoxer groups: - - Inventory # Corvax-Loadouts + # - Inventory # Corvax-Loadouts #Corvax-WL-Remove - GroupTankHarness - BoxerJumpsuit - BoxerGloves diff --git a/Resources/Prototypes/_WL/Loadouts/Miscellaneous/scarfs.yml b/Resources/Prototypes/_WL/Loadouts/Miscellaneous/scarfs.yml index ea6e7f033c..0f922a99eb 100644 --- a/Resources/Prototypes/_WL/Loadouts/Miscellaneous/scarfs.yml +++ b/Resources/Prototypes/_WL/Loadouts/Miscellaneous/scarfs.yml @@ -1,101 +1,121 @@ # Basic options # Scarfs - type: loadout + groupBy: "Scarfs" id: ScarfStripedRed equipment: neck: ClothingNeckScarfStripedRed - type: loadout + groupBy: "Scarfs" id: ScarfStripedBlue equipment: neck: ClothingNeckScarfStripedBlue - type: loadout + groupBy: "Scarfs" id: ScarfStripedGreen equipment: neck: ClothingNeckScarfStripedGreen - type: loadout + groupBy: "Scarfs" id: ScarfStripedBlack equipment: neck: ClothingNeckScarfStripedBlack - type: loadout + groupBy: "Scarfs" id: ScarfStripedBrown equipment: neck: ClothingNeckScarfStripedBrown - type: loadout + groupBy: "Scarfs" id: ScarfStripedLightBlue equipment: neck: ClothingNeckScarfStripedLightBlue - type: loadout + groupBy: "Scarfs" id: ScarfStripedOrange equipment: neck: ClothingNeckScarfStripedOrange - type: loadout + groupBy: "Scarfs" id: ScarfStripedPurple equipment: neck: ClothingNeckScarfStripedPurple - type: loadout + groupBy: "Scarfs" id: ScarfStripedAce equipment: neck: ClothingNeckScarfStripedAce - type: loadout + groupBy: "Scarfs" id: ScarfStripedAro equipment: neck: ClothingNeckScarfStripedAro - type: loadout + groupBy: "Scarfs" id: ScarfStripedAroace equipment: neck: ClothingNeckScarfStripedAroace - type: loadout + groupBy: "Scarfs" id: ScarfStripedBiSexual equipment: neck: ClothingNeckScarfStripedBiSexual - type: loadout + groupBy: "Scarfs" id: ScarfStripedGay equipment: neck: ClothingNeckScarfStripedGay - type: loadout + groupBy: "Scarfs" id: ScarfStripedInter equipment: neck: ClothingNeckScarfStripedInter - type: loadout + groupBy: "Scarfs" id: ScarfStripedLesbian equipment: neck: ClothingNeckScarfStripedLesbian - type: loadout + groupBy: "Scarfs" id: ScarfStripedPan equipment: neck: ClothingNeckScarfStripedPan - type: loadout + groupBy: "Scarfs" id: ScarfStripedNonBinary equipment: neck: ClothingNeckScarfStripedNonBinary - type: loadout + groupBy: "Scarfs" id: ScarfStripedRainbow equipment: neck: ClothingNeckScarfStripedRainbow - type: loadout + groupBy: "Scarfs" id: ScarfStripedTrans equipment: neck: ClothingNeckScarfStripedTrans - type: loadout + groupBy: "Scarfs" id: ScarfStripedLesbianLong equipment: neck: ClothingNeckScarfStripedLesbianLong diff --git a/Resources/Prototypes/_WL/Loadouts/Miscellaneous/ties.yml b/Resources/Prototypes/_WL/Loadouts/Miscellaneous/ties.yml index 678f90624a..acb70f5443 100644 --- a/Resources/Prototypes/_WL/Loadouts/Miscellaneous/ties.yml +++ b/Resources/Prototypes/_WL/Loadouts/Miscellaneous/ties.yml @@ -1,50 +1,60 @@ # Ties - type: loadout + groupBy: "Ties" id: TieRed equipment: neck: ClothingNeckTieRed - type: loadout + groupBy: "Ties" id: TieBlue equipment: neck: ClothingNeckTieBlue - type: loadout + groupBy: "Ties" id: TieGreen equipment: neck: ClothingNeckTieGreen - type: loadout + groupBy: "Ties" id: TieGray equipment: neck: ClothingNeckTieGray - type: loadout + groupBy: "Ties" id: TieYellow equipment: neck: ClothingNeckTieYellow - type: loadout + groupBy: "Ties" id: TieLightBlue equipment: neck: ClothingNeckTieLightBlue - type: loadout + groupBy: "Ties" id: TieOrange equipment: neck: ClothingNeckTieOrange - type: loadout + groupBy: "Ties" id: TiePurple equipment: neck: ClothingNeckTiePurple - type: loadout + groupBy: "Ties" id: TiePink equipment: neck: ClothingNeckTiePink - type: loadout + groupBy: "Ties" id: TieRainbow equipment: neck: ClothingNeckTieRainbow diff --git a/Resources/Prototypes/_WL/Loadouts/role_loadouts.yml b/Resources/Prototypes/_WL/Loadouts/role_loadouts.yml index 468a5aebcb..f11df7af79 100644 --- a/Resources/Prototypes/_WL/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_WL/Loadouts/role_loadouts.yml @@ -1,7 +1,6 @@ - type: roleLoadout id: JobAdjutant groups: - - Inventory # Corvax-Loadouts - AdjutantHead - AdjutantJumpsuit - AdjutantBackpack diff --git a/Resources/Prototypes/_WL/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_WL/Roles/Jobs/Command/adjutant.yml index 3b8ea28b30..1c323e9a76 100644 --- a/Resources/Prototypes/_WL/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_WL/Roles/Jobs/Command/adjutant.yml @@ -40,11 +40,13 @@ - type: chameleonOutfit id: AdjutantChameleonOutfit job: Adjutant + hasMindShield: true equipment: eyes: ClothingEyesHudCommand mask: ClothingMaskBreath - outerClothing: ClothingOuterWinterColorLightBrown + outerClothing: ClothingOuterWinterAdjutant neck: ClothingNeckScarfStripedBrown belt: ClothingBeltStorageWaistbag gloves: ClothingHandsGlovesColorBlack back: ClothingBackpackAdjutant + head: ClothingHeadHatBeretAdjutant diff --git a/Resources/Prototypes/_WL/Species/golem.yml b/Resources/Prototypes/_WL/Species/golem.yml index a972b053ef..63e9c4da9a 100644 --- a/Resources/Prototypes/_WL/Species/golem.yml +++ b/Resources/Prototypes/_WL/Species/golem.yml @@ -40,6 +40,7 @@ - type: markingPoints id: MobGolemMarkingLimits + onlyWhitelisted: true points: Hair: points: 0 diff --git a/Resources/Prototypes/_WL/Species/kidan.yml b/Resources/Prototypes/_WL/Species/kidan.yml index fd3781caeb..c9b3f2c4d8 100644 --- a/Resources/Prototypes/_WL/Species/kidan.yml +++ b/Resources/Prototypes/_WL/Species/kidan.yml @@ -5,7 +5,7 @@ prototype: MobHumanoidKidan sprites: MobHumanoidKidanSprites defaultSkinTone: "#ffc0cb" - markingLimits: MobHumanMarkingLimits + markingLimits: MobKidanMarkingLimits dollPrototype: MobHumanoidKidanDummy skinColoration: Hues maleFirstNames: NamesReptilianMale @@ -33,6 +33,44 @@ RFoot: MobHumanoidKidanRFoot Foots: MobHumanoidAnyMarking # WL-Underwear +- type: markingPoints + id: MobKidanMarkingLimits + onlyWhitelisted: true + points: + Hair: + points: 0 + required: false + FacialHair: + points: 0 + required: false + Snout: + points: 1 + required: false + Tail: # the cat tail joke + points: 1 # Corvax-Sponsors + required: false + HeadTop: + points: 1 + required: false + UndergarmentTop: + points: 1 + required: false + UndergarmentBottom: + points: 1 + required: false + Chest: + points: 2 + required: false + Legs: + points: 4 # WL-Changes: More cyberlyds + required: false + Arms: + points: 4 # WL-Changes: More cyberlyds + required: false + Socks: # WL-Underwear + points: 1 + required: false + - type: humanoidBaseSprite id: MobHumanoidKidanHead baseSprite: