diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml index 01d1f1c92ed..409e8c95cb8 100644 --- a/Resources/Audio/Ambience/attributions.yml +++ b/Resources/Audio/Ambience/attributions.yml @@ -121,3 +121,8 @@ license: "CC0-1.0" copyright: "Created by dimbark1, edited and converted to mono by TheShuEd" source: "https://freesound.org/people/dimbark1/sounds/316797/" + +- files: ["frontier.ogg"] + license: "CC0-1.0" + copyright: "Created by bishkek_pro_master" + source: "https://band.link/juBQi" diff --git a/Resources/Audio/Ambience/frontier.ogg b/Resources/Audio/Ambience/frontier.ogg new file mode 100644 index 00000000000..fb35c9093ac Binary files /dev/null and b/Resources/Audio/Ambience/frontier.ogg differ diff --git a/Resources/Locale/ru-RU/corvax/markings/xenoslime.ftl b/Resources/Locale/ru-RU/corvax/markings/xenoslime.ftl new file mode 100644 index 00000000000..5f479c655d2 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/markings/xenoslime.ftl @@ -0,0 +1,14 @@ +marking-SlimePawSocks-pawsocks = Носки на лапах из слизи +marking-SlimePawSocks = Носки на лапах из слизи +marking-FoxSlimeTail-vulp_tail = Лисий хвост из слизи +marking-FoxSlimeTail = Лисий хвост из слизи +marking-FoxSlimeEar-vulp_ear = Лисье ухо из слизи (внешнее) +marking-FoxSlimeEar-vulp_ear_inner = Лисье ухо из слизи (внутреннее) +marking-FoxSlimeEar = Лисье ухо из слизи +marking-WolfSlimeTail-wolf_tail = Волчий хвост из слизи (основа) +marking-WolfSlimeTail-wolf_tail_inner = Волчий хвост из слизи (конец) +marking-WolfSlimeTail = Волчий хвост из слизи +marking-FoxSlimeBelly-vulp_belly-torso = Лисье брюхо из слизи +marking-FoxSlimeBelly = Лисье брюхо из слизи +marking-FoxSlimeSnout-vulp_face = Лисья морда из слизи +marking-FoxSlimeSnout = Лисья морда из слизи diff --git a/Resources/Locale/ru-RU/corvax/species/species.ftl b/Resources/Locale/ru-RU/corvax/species/species.ftl new file mode 100644 index 00000000000..3bf77fd2a02 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/species/species.ftl @@ -0,0 +1 @@ +species-name-xenoslime = Ксенослайм diff --git a/Resources/Prototypes/Corvax/Body/Parts/xenoslime.yml b/Resources/Prototypes/Corvax/Body/Parts/xenoslime.yml new file mode 100644 index 00000000000..b907eb071b4 --- /dev/null +++ b/Resources/Prototypes/Corvax/Body/Parts/xenoslime.yml @@ -0,0 +1,119 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartXenoslime + parent: [BaseItem, BasePart] + name: "xenoslime body part" + abstract: true + components: + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Slime + Quantity: 10 + +- type: entity + id: TorsoXenoslime + name: "xenoslime torso" + parent: [PartXenoslime, BaseTorso] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Slime + Quantity: 20 + +- type: entity + id: HeadXenoslime + name: "xenoslime head" + parent: [PartXenoslime, BaseHead] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Slime + Quantity: 10 + +- type: entity + id: LeftArmXenoslime + name: "left xenoslime arm" + parent: [PartXenoslime, BaseLeftArm] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "l_arm" + +- type: entity + id: RightArmXenoslime + name: "right xenoslime arm" + parent: [PartXenoslime, BaseRightArm] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "r_arm" + +- type: entity + id: LeftHandXenoslime + name: "left xenoslime hand" + parent: [PartXenoslime, BaseLeftHand] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "l_hand" + +- type: entity + id: RightHandXenoslime + name: "right xenoslime hand" + parent: [PartXenoslime, BaseRightHand] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "r_hand" + +- type: entity + id: LeftLegXenoslime + name: "left xenoslime leg" + parent: [PartXenoslime, BaseLeftLeg] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "l_leg" + - type: MovementBodyPart + walkSpeed : 2.7 + sprintSpeed : 4.5 + +- type: entity + id: RightLegXenoslime + name: "right xenoslime leg" + parent: [PartXenoslime, BaseRightLeg] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "r_leg" + - type: MovementBodyPart + walkSpeed : 2.7 + sprintSpeed : 4.5 + +- type: entity + id: LeftFootXenoslime + name: "left xenoslime foot" + parent: [PartXenoslime, BaseLeftFoot] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "l_foot" + +- type: entity + id: RightFootXenoslime + name: "right xenoslime foot" + parent: [PartXenoslime, BaseRightFoot] + components: + - type: Sprite + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: "r_foot" diff --git a/Resources/Prototypes/Corvax/Body/Prototypes/xenoslime.yml b/Resources/Prototypes/Corvax/Body/Prototypes/xenoslime.yml new file mode 100644 index 00000000000..a6c459f84d7 --- /dev/null +++ b/Resources/Prototypes/Corvax/Body/Prototypes/xenoslime.yml @@ -0,0 +1,46 @@ +- type: body + name: "xenoslime" + id: Xenoslime + root: torso + slots: + head: + part: HeadXenoslime + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoXenoslime + organs: + core: SentientSlimeCore + lungs: OrganSlimeLungs + connections: + - left arm + - right arm + - left leg + - right leg + right arm: + part: RightArmXenoslime + connections: + - right hand + left arm: + part: LeftArmXenoslime + connections: + - left hand + right hand: + part: RightHandXenoslime + left hand: + part: LeftHandXenoslime + right leg: + part: RightLegXenoslime + connections: + - right foot + left leg: + part: LeftLegXenoslime + connections: + - left foot + right foot: + part: RightFootXenoslime + left foot: + part: LeftFootXenoslime diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/xenoslime.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/xenoslime.yml new file mode 100644 index 00000000000..77d120a7358 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/xenoslime.yml @@ -0,0 +1,57 @@ +- type: marking + id: SlimePawSocks + markingCategory: Overlay + bodyPart: RFoot #highest possible layer + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: pawsocks + +- type: marking + id: FoxSlimeTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: vulp_tail + +- type: marking + id: FoxSlimeEar + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: vulp_ear + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: vulp_ear_inner + +- type: marking + id: WolfSlimeTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: wolf_tail + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: wolf_tail_inner + +- type: marking + id: FoxSlimeBelly + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: vulp_belly-torso + +- type: marking + id: FoxSlimeSnout + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Xenoslime] + sprites: + - sprite: Corvax/Mobs/Customization/xenoslime.rsi + state: vulp_face diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/xenoslime.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/xenoslime.yml new file mode 100644 index 00000000000..938e0866e23 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/xenoslime.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McXenoslime + parent: [BaseMobXenoslime, BaseMob] + id: MobXenoslime diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml new file mode 100644 index 00000000000..6ee0347f8dd --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml @@ -0,0 +1,96 @@ +- type: entity + save: false + name: Urist McXenoclime + parent: BaseMobSpeciesOrganic + id: BaseMobXenoslime + abstract: true + components: + - type: Hunger # Corvax-Frontier + starvationDamage: + types: + Cold: 0.5 + Bloodloss: 0.5 + - type: Thirst + - type: Carriable # Carrying system from nyanotrasen. + - type: Icon + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: full + - type: Body + prototype: Xenoslime + requiredLegs: 2 + - type: HumanoidAppearance + species: Xenoslime + - type: Speech + speechVerb: Xenoslime + speechSounds: Xenoslime + - type: TypingIndicator + proto: Xenoslime + - type: Vocal + sounds: + Male: MaleXenoslime + Female: FemaleXenoslime + Unsexed: MaleXenoslime + - type: Damageable + damageContainer: Biological + damageModifierSet: Xenoslime + - type: Bloodstream + bloodReagent: Xenoslime # TODO Color Xenoslime blood based on their Xenoslime color or smth + - type: Barotrauma + damage: + types: + Blunt: 0.50 #per second, scales with pressure and other constants. + Heat: 0.2 # 0.1 more than humans, i feel like low pressure would make Xenoslime boil more than blunt stretch them so i decided on this instead. + - type: Inventory + speciesId: reptilian + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:HealthChange + scaleByQuantity: true + damage: + types: + Heat: 2 + - !type:PopupMessage + type: Local + visualType: Large + messages: [ "slime-hurt-by-water-popup" ] + probability: 0.25 + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatSlime + amount: 5 + - type: Respirator + damage: + types: + Asphyxiation: 0.2 + damageRecovery: + types: + Asphyxiation: -1.0 + maxSaturation: 15 + - type: SizeAttributeWhitelist # Frontier + short: true + shortscale: 0.8 + shortDensity: 140 + shortPseudoItem: true + shortCosmeticOnly: false + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobXenoslimeDummy + noSpawn: true + description: A dummy Xenoslime meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Xenoslime diff --git a/Resources/Prototypes/Corvax/Species/xenoslime.yml b/Resources/Prototypes/Corvax/Species/xenoslime.yml new file mode 100644 index 00000000000..844a3578f3a --- /dev/null +++ b/Resources/Prototypes/Corvax/Species/xenoslime.yml @@ -0,0 +1,145 @@ +- type: species + id: Xenoslime + name: species-name-xenoslime + roundStart: true + #sponsorOnly: true # Corvax-Sponsors + prototype: MobXenoslime + sprites: MobXenoslimeSprites + defaultSkinTone: "#eb943d" + markingLimits: MobXenoslimeMarkingLimits + dollPrototype: MobXenoslimeDummy + skinColoration: Hues + maleFirstNames: names_vulp_first_male + femaleFirstNames: names_vulp_first_female + maleLastNames: names_vulp_last # Corvax-LastnameGender + femaleLastNames: names_vulp_last # Corvax-LastnameGender + +- type: speciesBaseSprites + id: MobXenoslimeSprites + sprites: + Head: MobXenoslimeHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobXenoslimeTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobHumanoidEyes + LArm: MobXenoslimeLArm + RArm: MobXenoslimeRArm + LHand: MobXenoslimeLHand + RHand: MobXenoslimeRHand + LLeg: MobXenoslimeLLeg + RLeg: MobXenoslimeRLeg + LFoot: MobXenoslimeLFoot + RFoot: MobXenoslimeRFoot + +- type: markingPoints + id: MobXenoslimeMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 0 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ FoxSlimeTail ] + Snout: + points: 1 + required: true + defaultMarkings: [ FoxSlimeSnout ] + HeadTop: + points: 1 + required: true + defaultMarkings: [ FoxSlimeEar ] + HeadSide: + points: 1 + required: false + +- type: humanoidBaseSprite + id: MobXenoslimeHead + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobXenoslimeHeadMale + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobXenoslimeHeadFemale + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobXenoslimeTorso + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobXenoslimeTorsoMale + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobXenoslimeTorsoFemale + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobXenoslimeLLeg + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobXenoslimeLHand + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobXenoslimeLArm + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobXenoslimeLFoot + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobXenoslimeRLeg + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobXenoslimeRHand + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobXenoslimeRArm + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobXenoslimeRFoot + baseSprite: + sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8c1f924f92e..ec712c3171c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -265,11 +265,14 @@ - type: Lathe idleState: icon runningState: building - staticRecipes: - - LargeBeaker - - Dropper - - ClothingEyesGlassesChemical +# staticRecipes: Corvax-Frontier +# - LargeBeaker +# - Dropper +# - ClothingEyesGlassesChemical dynamicRecipes: + - LargeBeaker + - Dropper + - ClothingEyesGlassesChemical - PowerDrill - MiningDrill - AnomalyScanner @@ -895,9 +898,9 @@ - ClothingMaskSterile - DiseaseSwab - Beaker - - LargeBeaker - - Dropper - - Jug +# - LargeBeaker +# - Dropper +# - Jug - Syringe - Implanter - PillCanister @@ -921,7 +924,7 @@ - Drill - Saw - Hemostat - - ClothingEyesGlassesChemical +# - ClothingEyesGlassesChemical # Frontier Start - ClothingOuterSuitEmergency - ClothingOuterHardsuitVoidParamed @@ -931,8 +934,12 @@ - CryostasisBeaker - BluespaceBeaker - SyringeBluespace + - LargeBeaker + - Dropper - Jug + - ClothingEyesGlassesChemical - SyringeCryostasis + - HandheldCrewMonitor # Corvax-Frontier # Frontier Start - ClothingOuterHardsuitMedical # Frontier End diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index 353a642acc4..568770e35c5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -18,6 +18,7 @@ - Arsenal - Experimental - CivilianServices + - Biochemical # Corvax-Frontier - type: ApcPowerReceiver powerLoad: 200 - type: ExtensionCableReceiver diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 6a53d6c8e32..c7fa3a86572 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -77,6 +77,15 @@ materials: Cloth: 200 +- type: latheRecipe # Corvax-Frontier + id: HandheldCrewMonitor + result: HandheldCrewMonitorEmpty + completetime: 2 + materials: + Glass: 1200 + Steel: 1000 + Plastic: 1400 + - type: latheRecipe id: HandheldHealthAnalyzer result: HandheldHealthAnalyzerEmpty diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 2dacd628c25..64468dcbdfe 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -123,7 +123,7 @@ - TimerTrigger - FlashPayload - ExplosivePayload - - ChemicalPayload +# - ChemicalPayload - type: technology id: ConcentratedLaserWeaponry diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml new file mode 100644 index 00000000000..a8b7d7871ac --- /dev/null +++ b/Resources/Prototypes/Research/biochemical.yml @@ -0,0 +1,137 @@ +# Tier 1 + +- type: technology + id: Chemistry + name: research-technology-chemistry + icon: + sprite: Objects/Specific/Chemistry/beaker_large.rsi + state: beakerlarge + discipline: Biochemical + tier: 1 + cost: 5000 + recipeUnlocks: + - LargeBeaker + - Dropper + - HotplateMachineCircuitboard + - ChemicalPayload + - ClothingEyesGlassesChemical + - Jug + +- type: technology + id: SurgicalTools + name: research-technology-surgical-tools + icon: + sprite: Objects/Specific/Medical/Surgery/saw.rsi + state: saw + discipline: Biochemical + tier: 1 + cost: 2500 #this is useless so heavy decrease + recipeUnlocks: + - Scalpel + - Retractor + - Cautery + - Drill + - Saw + - Hemostat + +- type: technology + id: MechanizedTreatment + name: research-technology-mechanized-treatment + icon: + sprite: Mobs/Silicon/chassis.rsi + state: medical + discipline: Biochemical + tier: 1 + cost: 7500 + recipeUnlocks: + - BorgModuleAdvancedTreatment + - BorgModuleDefibrillator + +- type: technology + id: Virology + name: research-technology-virology + icon: + sprite: Structures/Machines/diagnoser.rsi + state: icon + discipline: Biochemical + tier: 1 + cost: 5000 + recipeUnlocks: + - VaccinatorMachineCircuitboard + - DiagnoserMachineCircuitboard + +# Tier 2 + +- type: technology + id: BiochemicalStasis + name: research-technology-biochemical-stasis + icon: + sprite: Structures/Machines/stasis_bed.rsi + state: icon + discipline: Biochemical + tier: 2 + cost: 7500 + recipeUnlocks: + - StasisBedMachineCircuitboard + - CryoPodMachineCircuitboard + - CryostasisBeaker + - SyringeCryostasis + +- type: technology + id: ChemicalDispensary + name: research-technology-chemical-dispensary + icon: + sprite: Structures/dispensers.rsi + state: industrial-working + discipline: Biochemical + tier: 2 + cost: 10000 + recipeUnlocks: + - ChemMasterMachineCircuitboard + - ChemDispenserMachineCircuitboard + - BorgModuleAdvancedTreatment + technologyPrerequisites: + - Chemistry + +- type: technology + id: CrewMonitoring + name: research-technology-crew-monitoring + icon: + sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi + state: scanner + discipline: Biochemical + tier: 2 + cost: 10000 + recipeUnlocks: + - HandheldCrewMonitor + +# Tier 3 + +- type: technology + id: BluespaceChemistry + name: research-technology-bluespace-chemistry + icon: + sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi + state: beakerbluespace + discipline: Biochemical + tier: 3 + cost: 10000 + recipeUnlocks: + - BluespaceBeaker + - SyringeBluespace + +# look into revisiting this later once medical isn't a hellhole +#- type: technology +# id: Cloning +# name: research-technology-cloning +# icon: +# sprite: Structures/Machines/cloning.rsi +# state: pod_0 +# discipline: Biochemical +# tier: 3 +# cost: 15000 +# recipeUnlocks: +# - CloningPodMachineCircuitboard +# - MedicalScannerMachineCircuitboard +# - CloningConsoleComputerCircuitboard +# - BiomassReclaimerMachineCircuitboard diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 2336f1feb3b..abcce059a05 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -113,7 +113,7 @@ recipeUnlocks: - FatExtractorMachineCircuitboard - BiofabricatorMachineCircuitboard - - BiomassReclaimerMachineCircuitboard + # - BiomassReclaimerMachineCircuitboard # Tier 2 @@ -133,33 +133,33 @@ - FauxTileAstroIce - FauxTileAstroSnow -- type: technology - id: BiochemicalStasis - name: research-technology-biochemical-stasis - icon: - sprite: Structures/Machines/stasis_bed.rsi - state: icon - discipline: CivilianServices - tier: 2 - cost: 7500 - recipeUnlocks: - - StasisBedMachineCircuitboard - - CryoPodMachineCircuitboard - - CryostasisBeaker - - SyringeCryostasis - -- type: technology - id: MechanizedTreatment - name: research-technology-mechanized-treatment - icon: - sprite: Mobs/Silicon/chassis.rsi - state: medical - discipline: CivilianServices - tier: 2 - cost: 5000 - recipeUnlocks: - - BorgModuleAdvancedTreatment - - BorgModuleDefibrillator +# - type: technology + # id: BiochemicalStasis + # name: research-technology-biochemical-stasis + # icon: + # sprite: Structures/Machines/stasis_bed.rsi + # state: icon + # discipline: CivilianServices + # tier: 2 + # cost: 7500 + # recipeUnlocks: + # - StasisBedMachineCircuitboard + # - CryoPodMachineCircuitboard + # - CryostasisBeaker + # - SyringeCryostasis + +# - type: technology + # id: MechanizedTreatment + # name: research-technology-mechanized-treatment + # icon: + # sprite: Mobs/Silicon/chassis.rsi + # state: medical + # discipline: CivilianServices + # tier: 2 + # cost: 5000 + # recipeUnlocks: + # - BorgModuleAdvancedTreatment + # - BorgModuleDefibrillator - type: technology id: AdvancedCleaning @@ -233,15 +233,15 @@ recipeUnlocks: - ClothingShoesBootsSpeed -- type: technology - id: BluespaceChemistry - name: research-technology-bluespace-chemistry - icon: - sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi - state: beakerbluespace - discipline: CivilianServices - tier: 3 - cost: 10000 - recipeUnlocks: - - BluespaceBeaker - - SyringeBluespace +# - type: technology + # id: BluespaceChemistry + # name: research-technology-bluespace-chemistry + # icon: + # sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi + # state: beakerbluespace + # discipline: CivilianServices + # tier: 3 + # cost: 10000 + # recipeUnlocks: + # - BluespaceBeaker + # - SyringeBluespace diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml index 7a661da1a33..7f164b898ed 100644 --- a/Resources/Prototypes/Research/disciplines.yml +++ b/Resources/Prototypes/Research/disciplines.yml @@ -10,6 +10,18 @@ 2: 0.75 3: 0.75 +- type: techDiscipline # Corvax-Frontier + id: Biochemical + name: research-discipline-biochemical + color: "#449ae6" + icon: + sprite: Interface/Misc/research_disciplines.rsi + state: biochemical + tierPrerequisites: + 1: 0 + 2: 0.75 + 3: 0.75 + - type: techDiscipline id: Arsenal name: research-discipline-arsenal diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml index 2011c6ceeae..52deb70446d 100644 --- a/Resources/Prototypes/StatusIcon/debug.yml +++ b/Resources/Prototypes/StatusIcon/debug.yml @@ -11,8 +11,15 @@ sprite: /Textures/Interface/Misc/research_disciplines.rsi state: arsenal -- type: statusIcon +- type: statusIcon # Corvax-Frontier id: DebugStatus3 + priority: 4 + icon: + sprite: /Textures/Interface/Misc/research_disciplines.rsi + state: biochemical + +- type: statusIcon + id: DebugStatus4 priority: 5 icon: sprite: /Textures/Interface/Misc/research_disciplines.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/shipyard_rcd.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/shipyard_rcd.yml index 2dedd89ba4f..02b2a4c265e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/shipyard_rcd.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/shipyard_rcd.yml @@ -27,8 +27,8 @@ - CableTerminal - Deconstruct - type: Sprite - sprite: Objects/Tools/rcd.rsi - state: icon-shipyard + sprite: Objects/Tools/shipyardrcd.rsi #Corvax-Frontier-Resprite + state: icon - type: Item size: Normal - type: PhysicalComposition diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml index 48ae087fd7a..bfe1a591264 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/tools.yml @@ -7,11 +7,11 @@ - type: RCDAmmo isShipyardRCDAmmo: true - type: Sprite - sprite: Objects/Tools/rcd.rsi - state: ammo-shipyard + sprite: Objects/Tools/shipyardrcd.rsi # Corvax-Frontier Resprite + state: ammo - type: Item - sprite: Objects/Tools/rcd.rsi - heldPrefix: ammo-shipyard + sprite: Objects/Tools/shipyardrcd.rsi # Corvax-Frontier Resprite + heldPrefix: ammo - type: PhysicalComposition materialComposition: Steel: 1000 diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml index 24df3239b5c..f077c612dc2 100644 --- a/Resources/Prototypes/audio.yml +++ b/Resources/Prototypes/audio.yml @@ -176,6 +176,7 @@ - /Audio/Ambience/ambiruin7.ogg - /Audio/Ambience/voyage_neverending.ogg - /Audio/Ambience/unanchored.ogg + - /Audio/Ambience/frontier.ogg - type: soundCollection id: AmbienceRuins diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/meta.json b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/meta.json new file mode 100644 index 00000000000..81304433e97 --- /dev/null +++ b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite created by svarshiksatanist", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "square", + "directions": 4 + }, + { + "name": "pawsocks", + "directions": 4 + }, + { + "name": "vulp_tail", + "directions": 4 + }, + { + "name": "vulp_ear", + "directions": 4 + }, + { + "name": "vulp_ear_inner", + "directions": 4 + }, + { + "name": "vulp_belly-torso", + "directions": 4 + }, + { + "name": "vulp_face", + "directions": 4 + }, + { + "name": "wolf_tail", + "directions": 4 + }, + { + "name": "wolf_tail_inner", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/pawsocks.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/pawsocks.png new file mode 100644 index 00000000000..df0094c304d Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/pawsocks.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/square.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/square.png new file mode 100644 index 00000000000..f26e37a0e00 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/square.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_belly-torso.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_belly-torso.png new file mode 100644 index 00000000000..c88d4b17d86 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_belly-torso.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear.png new file mode 100644 index 00000000000..f4ae4de421c Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear_inner.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear_inner.png new file mode 100644 index 00000000000..743ccddec35 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_ear_inner.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_face.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_face.png new file mode 100644 index 00000000000..892ea3b142c Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_face.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_tail.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_tail.png new file mode 100644 index 00000000000..7e34226092a Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/vulp_tail.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail.png new file mode 100644 index 00000000000..bbaceedabab Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail.png differ diff --git a/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail_inner.png b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail_inner.png new file mode 100644 index 00000000000..f5bd022385c Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Customization/xenoslime.rsi/wolf_tail_inner.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/full.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/full.png new file mode 100644 index 00000000000..e824a76add6 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/full.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_f.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_f.png new file mode 100644 index 00000000000..5627fa3a098 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_m.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_m.png new file mode 100644 index 00000000000..5538a8013be Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_arm.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_arm.png new file mode 100644 index 00000000000..8f01131df6e Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_foot.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_foot.png new file mode 100644 index 00000000000..dd78e290c5f Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_hand.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_hand.png new file mode 100644 index 00000000000..a8392ab69c3 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_leg.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_leg.png new file mode 100644 index 00000000000..883baeaf436 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/meta.json b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/meta.json new file mode 100644 index 00000000000..3629063f2d3 --- /dev/null +++ b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite created by svarshiksatanist", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_arm.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_arm.png new file mode 100644 index 00000000000..4e640cdf864 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_foot.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_foot.png new file mode 100644 index 00000000000..5f3cd4f2f39 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_hand.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_hand.png new file mode 100644 index 00000000000..76109d28ac5 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_leg.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_leg.png new file mode 100644 index 00000000000..c38e2fbfa3a Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_f.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_f.png new file mode 100644 index 00000000000..67fb14db4c6 Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_m.png b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_m.png new file mode 100644 index 00000000000..18eebc4b84c Binary files /dev/null and b/Resources/Textures/Corvax/Mobs/Species/Xenoslime/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png index fca34fb2293..9b52e0e68b7 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png index 3b749d582a5..e0f5c645576 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-left.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-left.png new file mode 100644 index 00000000000..b035eb2ccd2 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-right.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-right.png new file mode 100644 index 00000000000..c4757d1e659 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo.png new file mode 100644 index 00000000000..e7ecb309989 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/ammo.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d658a5fed79 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/icon.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/icon.png new file mode 100644 index 00000000000..7e038d4bb5b Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-left.png new file mode 100644 index 00000000000..1430676f5f0 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-right.png new file mode 100644 index 00000000000..4f049ca94b2 Binary files /dev/null and b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/shipyardrcd.rsi/meta.json b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/meta.json new file mode 100644 index 00000000000..7899f499f88 --- /dev/null +++ b/Resources/Textures/Objects/Tools/shipyardrcd.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprite created by bopon_", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "ammo" + }, + { + "name": "ammo-inhand-left", + "directions": 4 + }, + { + "name": "ammo-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..a2985eabfc9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json index 32111d1a3cc..878632e0ae2 100644 --- a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json @@ -54,6 +54,32 @@ 0.2 ] ] + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "on-equipped-SUITSTORAGE", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..3846e862a1e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..eb0c781260d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/meta.json b/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/meta.json index f963187fbdf..8de644d864d 100644 --- a/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Tanks/emergency_double_air.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-BELT", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "equipped-SUITSTORAGE-dog", "directions": 4, diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..65f3aacd308 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json index 90a5a880de3..5d749b0cc22 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json @@ -24,6 +24,10 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..0fae61a0aa8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json index b5812f4d4d7..0b170dac026 100644 --- a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json @@ -45,6 +45,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..28077085547 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json index 98181d3ead3..900fa0ea3f4 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..35048bf7f6f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/meta.json index f76d3f1418a..1305b8d7af4 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Bow/crossbow.rsi/meta.json @@ -29,6 +29,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..c17a68eb35a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json index 464c22d1a7a..ba98ab5fafa 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json @@ -28,6 +28,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..67f678b3ffb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json index 2697b05d4e8..c91a1c75259 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json @@ -22,6 +22,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "equipped-BELT", "directions": 4