diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index c23db4b8e3e..88b1cecc26f 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -374,3 +374,5 @@ ent-ADTClothingUniformSwimsuitWinth = купальник ведьмочки .desc = Точно не для повседневного ношения, так ведь?.. .suffix = Хеллоуин +ent-ADTClothingUniformJumpsuitCamisoleQM = укороченный камзол квартирмейстера + .desc = Камзол, который одновременно хорош как для работы так и для отдыха. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml index 04bf6858c9f..98e79465e36 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml @@ -118,6 +118,7 @@ Piercing: 0.7 Heat: 0.6 Radiation: 0.9 + staminaModifier: 0.65 - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 @@ -148,7 +149,7 @@ Heat: 0.7 Radiation: 0.3 Caustic: 0.5 - # Stun: 0.9 + staminaModifier: 0.85 - type: ExplosionResistance damageCoefficient: 0.6 - type: ToggleableClothing diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 4437dc734e8..a25d150167d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -1230,3 +1230,13 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/winth_swimsuit.rsi +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitCamisoleQM + name: Quartermaster's camisole + description: short camisole + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index dc4cf6e1640..e57eabd166e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -519,3 +519,13 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/redhat.rsi +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpskirtCamisoleQM + name: Quartermaster's camisole with skirt + description: short camisole + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml index 76fe02bdcdd..5453b75729e 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml @@ -69,6 +69,33 @@ - type: Wagging - type: Inventory speciesId: vulp + maleDisplacements: + head: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: jumpsuit-female + head: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic @@ -114,4 +141,31 @@ noRot: true drawdepth: Mobs scale: 0.95, 0.95 - + - type: Inventory + maleDisplacements: + head: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: jumpsuit-female + head: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: head diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml index ab9bbf29c67..f54c7905486 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml @@ -55,6 +55,14 @@ 285: 0.8 248: 0.6 220: 0.4 + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Demon/displacement.rsi + state: jumpsuit-female + - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic @@ -85,3 +93,10 @@ components: - type: HumanoidAppearance species: DemonSpecies + - type: Inventory + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi + state: jumpsuit-female diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/quartermaster.yml new file mode 100644 index 00000000000..b963366d61c --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/quartermaster.yml @@ -0,0 +1,27 @@ +- type: loadoutEffectGroup + id: ADTQMJumpsuitCamisole + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobQuartermaster + time: 72000 #20 hrs + +- type: loadoutEffectGroup + id: ADTQMJumpskirtCamisole + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobQuartermaster + time: 72000 #20 hrs + +- type: loadout + id: ADTQMJumpsuitCamisole + equipment: + jumpsuit: ADTClothingUniformJumpsuitCamisoleQM + +- type: loadout + id: ADTQMJumpskirtCamisole + equipment: + jumpsuit: ADTClothingUniformJumpskirtCamisoleQM diff --git a/Resources/Prototypes/ADT/Reagents/Materials/materials.yml b/Resources/Prototypes/ADT/Reagents/Materials/materials.yml new file mode 100644 index 00000000000..38cad58d906 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Materials/materials.yml @@ -0,0 +1,7 @@ +- type: material + id: ADTPaper + stackEntity: Paper + name: materials-paper + icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } + color: "#d9d9d9" + price: 0.01 # it's paper bro what do you expect? diff --git a/Resources/Prototypes/ADT/Stacks/misc.yml b/Resources/Prototypes/ADT/Stacks/misc.yml index d2689def56e..4f8d5074396 100644 --- a/Resources/Prototypes/ADT/Stacks/misc.yml +++ b/Resources/Prototypes/ADT/Stacks/misc.yml @@ -6,3 +6,11 @@ maxCount: 1 # itemSize: 1 +- type: stack + id: ADTPaper + name: paper + icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } + spawn: Paper + maxCount: 1 + # itemSize: 1 + diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml index 6cdcf8cf0d2..da4ed21e5e8 100644 --- a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml +++ b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml @@ -107,5 +107,5 @@ tags: - Document storage: - Paper: 0 + ADTPaper: 0 # ADT tweak - type: DocumentPrinter #DocumentPrinterComponent (ADT) diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml index 6435e414274..ce20f16629b 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/printer.yml @@ -5,7 +5,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReportOnEliminationOfViolationsRecipe @@ -14,7 +14,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReporDepartmentRecipe @@ -23,7 +23,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReportEmployeePerformanceRecipe @@ -32,7 +32,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReportOnTheChaptersMeetingRecipe @@ -41,7 +41,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentInternalAffairsAgentsReportRecipe @@ -50,7 +50,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentConditionReportRecipe @@ -59,7 +59,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReportStudyObjectRecipe @@ -68,7 +68,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentExperimentReportRecipe @@ -77,7 +77,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentDisposalReportRecipe @@ -86,7 +86,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentApplicationAppointmentInterimRecipe @@ -95,7 +95,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentApplicationEmploymentRecipe @@ -104,7 +104,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentLetterResignationRecipe @@ -113,7 +113,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentApplicationAccessRecipe @@ -122,7 +122,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentApplicationEquipmentRecipe @@ -131,7 +131,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentAppealRecipe @@ -140,7 +140,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentEvacuationShuttleRequestRecipe @@ -149,7 +149,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentShuttleRegistrationRequestRecipe @@ -158,7 +158,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestCallMembersCentralCommitteeDSORecipe @@ -167,7 +167,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestRequestToEstablishThreatLevelRecipe @@ -176,7 +176,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestChangeSalaryRecipe @@ -185,7 +185,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestForNonlistedEmploymentRecipe @@ -194,7 +194,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestForPromotionRecipe @@ -203,7 +203,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestDocumentsRecipe @@ -212,7 +212,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestEuthanasiaRecipe @@ -221,7 +221,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestConstructionWorkRecipe @@ -230,7 +230,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentRequestModernizationRecipe @@ -239,7 +239,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentComplaintViolationLaborRulesRecipe @@ -248,7 +248,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentComplaintOffenseRecipe @@ -257,7 +257,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPermissionEquipmentRecipe @@ -266,7 +266,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPermissionToTravelInCaseOfThreatRecipe @@ -275,7 +275,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentSearchPermissionRecipe @@ -284,7 +284,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPermissionToCarryWeaponsRecipe @@ -293,7 +293,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPrescriptionDrugAuthorizationRecipe @@ -302,7 +302,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPermissionDisposeBodyRecipe @@ -311,7 +311,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentConstructionPermitRecipe @@ -320,7 +320,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentPermissionToExtendMarriageRecipe @@ -329,7 +329,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderDismissalRecipe @@ -338,7 +338,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderDeprivationAccessRecipe @@ -347,7 +347,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderEncouragementRecipe @@ -356,7 +356,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderParolePrisonerRecipe @@ -365,7 +365,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderRecognizingSentienceCreatureRecipe @@ -374,7 +374,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderMedicalInterventionRecipe @@ -383,7 +383,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentProductManufacturingOrderRecipe @@ -392,7 +392,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderPurchaseResourcesEquipmentRecipe @@ -401,7 +401,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderingSpecialEquipmentRecipe @@ -410,7 +410,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentOrderPurchaseWeaponsRecipe @@ -419,7 +419,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentCertificateRecipe @@ -428,7 +428,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentCertificateAdvancedTrainingRecipe @@ -437,7 +437,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentCertificateOffenseRecipe @@ -446,7 +446,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentDeathCertificateRecipe @@ -455,7 +455,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentMarriageCertificateRecipe @@ -464,7 +464,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentDivorceCertificateRecipe @@ -473,7 +473,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentClosingIndictmentRecipe @@ -482,7 +482,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentSentenceRecipe @@ -491,7 +491,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentJudgmentRecipe @@ -500,7 +500,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentStatementHealtheRecipe @@ -509,7 +509,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentDecisionToStartTrialRecipe @@ -518,7 +518,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentErrorLoadingFormHeaderRecipe @@ -527,7 +527,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentNoticeOfLiquidationRecipe @@ -536,7 +536,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentBusinessDealRecipe @@ -545,7 +545,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentNoteBeginningMilitaryActionsRecipe @@ -554,7 +554,7 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix - type: latheRecipe id: PrintedDocumentReportAccomplishmentGoalsRecipe @@ -563,4 +563,4 @@ completetime: 2 applyMaterialDiscount: false materials: - Paper: 100 + ADTPaper: 100 # ADT fix diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 524c3c83480..cf59da867fe 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -446,9 +446,10 @@ Piercing: 0.5 Radiation: 0.5 Caustic: 0.6 + staminaModifier: 0.7 # ADT tweak - type: ClothingSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 + walkModifier: 0.75 # ADT tweak + sprintModifier: 0.75 # ADT tweak - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index e44f102b8e8..abf5d3822d8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -829,12 +829,18 @@ name: ghost-role-information-smile-name description: ghost-role-information-smile-description rules: ghost-role-information-nonantagonist-rules + raffle: null # ADT-Tweak-start requirements: - !type:OverallPlaytimeRequirement time: 7200 # 2h overall + - type: Prying + pryPowered: false + force: false + speedModifier: 0.1 + useSound: + path: /Audio/Items/crowbar.ogg # ADT-Tweak-end - raffle: null - type: Grammar attributes: proper: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 80f42d4af0d..a90167d77cf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -33,7 +33,7 @@ - type: Appearance - type: FaxableObject - type: PaperVisuals - backgroundModulate: "#cccccc" # ADT CHANGES START ---> + backgroundModulate: "#cccccc" # ADT CHANGES START ---> contentImageModulate: "#cccccc" backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 #Уголки бумаги contentMargin: 16.0, 16.0, 16.0, 16.0 # ADT CHANGES END <-- @@ -80,7 +80,10 @@ - type: Material - type: PhysicalComposition materialComposition: - Paper: 100 + ADTPaper: 100 # ADT tweak + - type: Stack + stackType: ADTPaper + count: 1 # Corvax-Printer-End - type: entity diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 1bc1b5d2de9..85e0d9978c1 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -642,6 +642,8 @@ - QuartermasterTurtleneck - QuartermasterTurtleneckSkirt - QuartermasterFormalSuit + - ADTQMJumpsuitCamisole # ADT tweak + - ADTQMJumpskirtCamisole # ADT tweak - type: loadoutGroup id: QuartermasterNeck @@ -1189,7 +1191,7 @@ - ADTEmergencyMothSecurity #ADT_Species - ADTEmergencyIPCSecurity #ADT_Species -- type: loadoutGroup +- type: loadoutGroup id: SecurityStar name: loadout-group-security-star minLimit: 0 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0f2bb692a8f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/icon.png new file mode 100644 index 00000000000..1b1f797beff Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-left.png new file mode 100644 index 00000000000..dc03d10e887 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-right.png new file mode 100644 index 00000000000..573a08bcf73 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/meta.json new file mode 100644 index 00000000000..a75ec939d51 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:justkekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e9906319890 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/icon.png new file mode 100644 index 00000000000..a94eef8acd1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-left.png new file mode 100644 index 00000000000..dc03d10e887 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-right.png new file mode 100644 index 00000000000..573a08bcf73 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/meta.json new file mode 100644 index 00000000000..a75ec939d51 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:justkekc", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/jumpsuit-female.png b/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/jumpsuit-female.png new file mode 100644 index 00000000000..be9c1064fbd Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/jumpsuit-female.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/meta.json b/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/meta.json new file mode 100644 index 00000000000..7ac587cad70 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Species/Demon/displacement.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit-female", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/head.png b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/head.png new file mode 100644 index 00000000000..59a5aa627de Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/head.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit-female.png b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit-female.png new file mode 100644 index 00000000000..be9c1064fbd Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/jumpsuit-female.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/meta.json b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/meta.json new file mode 100644 index 00000000000..d177f7b8e62 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/displacement.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by TheShuEd, head by Filo", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit-female", + "directions": 4 + }, + { + "name": "head", + "directions": 4 + } + ] +}