diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl new file mode 100644 index 00000000000..360db121174 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/power/powercells.ftl @@ -0,0 +1,19 @@ +ent-PowerCellCombat = hyper-capacity combat power cell + .desc = A rechargeable standardized power cell. This one hyper-capacity power cell with EMP immune. + .suffix = Full +ent-PowerCellCombatPrinted = { ent-PowerCellCombat } + .suffix = Empty + .desc = { ent-PowerCellCombat.desc } +ent-PowerCellNanoTrasen = hyper-capacity NanoTrasen power cell + .desc = { ent-PowerCellCombat.desc } + .suffix = Full +ent-PowerCellSyndicate = hyper-capacity Syndicate power cell + .desc = { ent-PowerCellCombat.desc } + .suffix = Full + +ent-PowerCageCombat = hyper-capacity combat power cage + .desc = A rechargeable power cage for big devices. Increased capacity for increased power levels. Has EMP immune. +ent-PowerCageERT = hyper-capacity NanoTrasen power cage + .desc = { ent-PowerCageCombat.desc } +ent-PowerCageSyndicate = hyper-capacity Syndicate power cage + .desc = { ent-PowerCageCombat.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index d150089cf44..f02081d36f5 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -10,3 +10,5 @@ ent-WeaponPistolMk58 = mk 58 .desc = A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. ent-WeaponPistolN1984 = N1984 .desc = The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. +ent-WeaponFlareGunSecurity = security shell gun + .desc = A modified flare gun originally designed to be used by security to launch non-lethal shotgun shells, however it can also fire lethal shells without risk. diff --git a/Resources/Locale/en-US/_strings/research/technologies.ftl b/Resources/Locale/en-US/_strings/research/technologies.ftl index e771788a1f2..f7492e4022f 100644 --- a/Resources/Locale/en-US/_strings/research/technologies.ftl +++ b/Resources/Locale/en-US/_strings/research/technologies.ftl @@ -45,6 +45,7 @@ research-technology-advanced-shuttle-weapon = Advanced shuttle weapons research-technology-advance-laser = Military-grade energy weaponry research-technology-explosive-mech-ammunition = Explosive Mech Ammunition research-technology-combat-equipment = Combat equipment +research-technology-combat-powercells = Combat Super Powercells research-technology-basic-robotics = Basic Robotics research-technology-basic-anomalous-research = Basic Anomalous Research diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl new file mode 100644 index 00000000000..ec488d22d91 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl @@ -0,0 +1,22 @@ +ent-PowerCellCombat = военная батарея гипер ёмкости + .desc = Стандартизированный перезаряжаемый элемент питания. накопитель гипер ёмкости военного типа, имеет встроенную ЭМИ защиту. + .suffix = Полный +ent-PowerCellCombatPrinted = { ent-PowerCellCombat } + .suffix = Пустой + .desc = { ent-PowerCellCombat.desc } +ent-PowerCellNanoTrasen = батарея гипер ёмкости NanoTrasen + .desc = { ent-PowerCellCombat.desc } + .suffix = Полный +ent-PowerCellSyndicate = батарея гипер ёмкости Syndicate + .desc = { ent-PowerCellCombat.desc } + .suffix = Полный + +ent-PowerCageCombat = военная энергоячейка гипер ёмкости + .desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Встроенная ЭМИ защита. + .suffix = Полный +ent-PowerCageERT = энергоячейка гипер ёмкости NanoTrasen + .desc = { ent-PowerCageCombat.desc } + .suffix = Полный +ent-PowerCageSyndicate = энергоячейка гипер ёмкости Syndicate + .desc = { ent-PowerCageCombat.desc } + .suffix = Полный \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index 5f867a6982c..673be8b2cfe 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -13,3 +13,5 @@ ent-WeaponPistolMk58 = МК 58 .suffix = Пистолет ent-WeaponPistolN1984 = N1984 .desc = Запасное оружие любого уважающего себя офицера. Выпускается в калибре .45 магнум, самом богоугодном калибре. +ent-WeaponFlareGunSecurity = сигнальный пистолет СБ + .desc = Компактный, однозарядный пистолет модифицированный под стрельбу ружейными летальными патронами без риска взорваться. diff --git a/Resources/Locale/ru-RU/_strings/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/research/technologies.ftl index cda171d8d0a..2f55c189a41 100644 --- a/Resources/Locale/ru-RU/_strings/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/research/technologies.ftl @@ -43,6 +43,7 @@ research-technology-experimental-battery-ammo = Батарейные боепр research-technology-advance-laser = Военное энергетическое вооружение research-technology-energy_barriers = Энергетические барьеры research-technology-combat-equipment = Боевое снаряжение +research-technology-combat-powercells = Боевые Супербатареи research-technology-basic-shuttle-armament = Базовое корабельное вооружение research-technology-advanced-shuttle-weapon = Продвинутое корабельное оружие research-technology-explosive-mech-ammunition = Взрывоопасные боеприпасы для меха diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9a708b9bb13..88f73b65fc8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -172,6 +172,7 @@ - Mousetrap - LightReplacer - TrashBag + - BoxShotgunFlare - PowerCellSmall - PowerCellMedium - RollerBedSpawnFolded @@ -230,6 +231,7 @@ - WeaponEnergyGunMini # Sunrise - Miniature Energy Gun - WeaponLaserSvalinn # Sunrise - Svalin shit weapon - ClothingHeadHelmetPubg # Sunrise - cheap if u have EMAG + - MagazineLightRifleBox #Sunrise - For Nukies - type: BlueprintReceiver whitelist: tags: @@ -364,6 +366,7 @@ - DeviceQuantumSpinInverter - EnergyDomeDirectionalTurtle # Sunrise-start + - PowerCellHyper - ClothingHeadHelmetPubgMore - MechPhasicScanningModule - HandCraftedNVD @@ -379,10 +382,15 @@ - type: EmagLatheRecipes emagDynamicRecipes: # Sunrise-Start - - CartridgePistolRubber - - CartridgeMagnumRubber - - CartridgeRifleRubber - - CartridgeLightRifleRubber + - BaseMagazinePistolCaselessRifleExtended + - PowerCellCombat + - MagazineLightRifleBoxIncendiary + - MagazineLightRifleBoxUranium + - MagazineMagnumUranium + - MagazineShotgunUranium + - MagazineLightRifleRubber + - MagazineRifleRubber + - MagazinePistolSubMachineGunRubber - MagazineBoxPistolRubber - MagazineBoxMagnumRubber - MagazineBoxRifleRubber @@ -793,6 +801,7 @@ idleState: icon runningState: icon staticRecipes: + - BoxShotgunFlare - BoxLethalshot - BoxShotgunPractice - BoxShotgunSlug @@ -811,8 +820,8 @@ - MagazineBoxRiflePractice - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol - - MagazinePistolEmpty + #- MagazinePistol Sunrise-Edit + #- MagazinePistolEmpty Sunrise-Edit - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunEmpty - MagazinePistolSubMachineGunTopMounted @@ -834,29 +843,14 @@ - WeaponLaserCarbinePractice - Zipties # Sunrise-start - - MagazineM16A4 - - MagazineLightMachineGunMG60 - - MagazinePPSH41 - - MagazineRPD - - MagazineNewVector - - MagazineMP38 - - MagazineMP5 - - MagazineMP7 + - SpeedLoaderMagnumRubber + - MagazineMagnumEmpty + - MagazineMagnum - MagazineP90 - - MagazineScorpion - - MagazineAK - - MagazineAR18 - - MagazineG36 - - MagazineM28 - - MagazineFamas - MagazineBR64 - - MagazineDragunov - - MagazineV31 - - MagazineACP14 - - MagazineGlock22 - - MagazineVP70 - - MagazineHIBrowning - - MagazineDeagle + - MagazinePistolHighCapacity + - MagazinePistolHighCapacityEmpty + - MagazineMagnum - ClothingHeadHelmetPubg # Sunrise-end dynamicRecipes: @@ -912,14 +906,20 @@ - WeaponLaserCarbine - WeaponXrayCannon # Sunrise-Start - - CartridgePistolRubber - - CartridgeMagnumRubber - - CartridgeRifleRubber - - CartridgeLightRifleRubber + - PowerCellCombat + - PowerCellHyper + - MagazinePistolSubMachineGunIncendiary + - MagazinePistolSubMachineGunUranium + - MagazineMagnumUranium + - MagazineShotgunUranium + - MagazineLightRifleRubber + - MagazineRifleRubber + - MagazinePistolSubMachineGunRubber - MagazineBoxPistolRubber - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber + - PowerCageCombat - WeaponMechCombatImmolationGun # Sunrise - Mechs - WeaponMechCombatSolarisLaser # Sunrise - Mechs - WeaponMechCombatFiredartLaser # Sunrise - Mechs @@ -934,20 +934,13 @@ - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine - ClothingShoesBootsMagCombat # Sunrise - Combat Magboots - - BaseMagazinePistolCaselessRifleExtended - - MagazinePPSH41Extended - MagazineMP5Extended - MagazineMP7Extended - MagazineP90Extended - MagazineM16A4Extended - - MagazineAR18Extended - - MagazineM28Extended - MagazineG36Extended - MagazineFamasExtended - - MagazineV31Extended - - MagazineBauer127Extended - MagazineBR64Extended - - MagazineDragunovExtended # Sunrise-End - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml index f830d8ab613..17c6cb24754 100644 --- a/Resources/Prototypes/Recipes/Lathes/powercells.yml +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -28,6 +28,30 @@ Glass: 400 Plastic: 200 Gold: 50 +#sunrise-start + +- type: latheRecipe + id: PowerCellHyper + result: PowerCellHyperPrinted + category: Parts + completetime: 15 + materials: + Steel: 300 + Glass: 400 + Plastic: 250 + Gold: 100 + +- type: latheRecipe + id: PowerCellCombat + result: PowerCellCombatPrinted + category: Parts + completetime: 25 + materials: + Steel: 400 + Glass: 500 + Plastic: 350 + Gold: 150 +#sunrise-end - type: latheRecipe id: PowerCellMicroreactor @@ -68,7 +92,7 @@ Plastic: 400 Gold: 100 -- type: latheRecipe +- type: latheRecipe #sunrise id: PowerCageCombat result: PowerCageCombat completetime: 15 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 4b6c4f71454..407b0ab786d 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -501,13 +501,13 @@ materials: Plastic: 750 -- type: latheRecipe - parent: BaseAmmoRecipe - id: BoxShotgunFlare - result: BoxShotgunFlare - materials: - Steel: 80 - Plastic: 80 +#- type: latheRecipe Sunrise-edit +# parent: BaseAmmoRecipe +# id: BoxShotgunFlare +# result: BoxShotgunFlare +# materials: +# Steel: 80 +# Plastic: 80 - type: latheRecipe parent: BaseAmmoRecipe diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 55e65e7ae1b..fc7d0b6e99d 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -28,6 +28,7 @@ - BoxShotgunIncendiary - MagazineRifleIncendiary - MagazinePistolIncendiary + - MagazinePistolSubMachineGunIncendiary #sunrise-edit - MagazineLightRifleIncendiary - SpeedLoaderMagnumIncendiary - MagazineShotgunIncendiary @@ -35,6 +36,7 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + - MagazineLightRifleBoxIncendiary #sunrise-edit - type: technology id: WeaponizedLaserManipulation @@ -67,10 +69,10 @@ - WeaponDisabler # Sunrise-Start - WeaponMechCombatDisabler - - CartridgePistolRubber - - CartridgeMagnumRubber - - CartridgeLightRifleRubber - - CartridgeRifleRubber + - MagazinePistolSubMachineGunRubber + - MagazineMagnumRubber + - MagazineLightRifleRubber + - MagazineRifleRubber - MagazineBoxPistolRubber - MagazineBoxMagnumRubber - MagazineBoxLightRifleRubber @@ -96,6 +98,10 @@ - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium - BoxShotgunUranium + - MagazineShotgunUranium # Sunrise-edit + - MagazineLightRifleBoxUranium # Sunrise-edit + - MagazineMagnumUranium # Sunrise-edit + - MagazinePistolSubMachineGunUranium # Sunrise-edit - type: technology id: AdvancedRiotControl diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index 70ce0f8b382..87b707bad3b 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -383,7 +383,7 @@ back: ClothingBackpackERTMedical shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT - eyes: ClothingEyesHudMedical + eyes: ClothingEyesHudMedSec # Sunrise-edit gloves: ClothingHandsGlovesCombat # Sunrise-edit outerClothing: ClothingOuterHardsuitERTMedical id: ERTMedicPDA diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml index dcafb1657c6..b3a80a01eda 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml @@ -13,8 +13,8 @@ state: o2 shader: unshaded - type: Battery - maxCharge: 2000 - startingCharge: 2000 + maxCharge: 1800 + startingCharge: 1800 - type: EmpImmune - type: entity @@ -32,8 +32,8 @@ state: o2 shader: unshaded - type: Battery - maxCharge: 2000 - startingCharge: 2000 + maxCharge: 1800 + startingCharge: 1800 - type: EmpImmune - type: entity @@ -51,6 +51,23 @@ state: o2 shader: unshaded - type: Battery - maxCharge: 2000 - startingCharge: 2000 + maxCharge: 1800 + startingCharge: 1800 - type: EmpImmune + +- type: entity + id: PowerCellCombatPrinted + suffix: Empty + parent: PowerCellCombat + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: combat + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + visible: false + - type: Battery + maxCharge: 1800 + startingCharge: 0 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index 2cd6854ec09..cca9aff7203 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -50,12 +50,12 @@ - type: InputMover - type: InteractionOutline - type: MovementSpeedModifier - baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseWalkSpeed: 1 + baseSprintSpeed: 1.5 friction: 5 - weightlessFriction: 5 - weightlessAcceleration: 4 - weightlessModifier: 2.8 + weightlessFriction: 4.5 + weightlessAcceleration: 3.5 + weightlessModifier: 3 - type: MovementAlwaysTouching - type: Pullable - type: Clickable @@ -161,7 +161,7 @@ startingEquipment: - WeaponMechCombatSolarisLaser - type: Reflect - reflectProb: 0.2 + reflectProb: 0.15 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -170,7 +170,7 @@ currentThresholdState: Alive thresholds: 0: Alive - 450: Critical + 380: Critical showOverlays: false allowRevives: true - type: ContainerFill diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml index a0d41f61b4f..0b6753cef63 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml @@ -42,42 +42,111 @@ Silver: 100 Plasma: 500 +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineLightRifleBoxIncendiary + result: MagazineLightRifleBoxIncendiary + materials: + Steel: 300 + Plastic: 1800 - type: latheRecipe - id: CartridgePistolRubber - result: CartridgePistolRubber - category: Ammo - completetime: 2 + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunUranium + result: MagazinePistolSubMachineGunUranium materials: - Plastic: 5 - Steel: 5 + Steel: 50 + Plastic: 130 + Uranium: 220 - type: latheRecipe - id: CartridgeMagnumRubber - result: CartridgeMagnumRubber - category: Ammo - completetime: 2 + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunIncendiary + result: MagazinePistolSubMachineGunIncendiary materials: - Plastic: 5 - Steel: 5 + Steel: 50 + Plastic: 350 - type: latheRecipe - id: CartridgeLightRifleRubber - result: CartridgeLightRifleRubber - category: Ammo - completetime: 2 + parent: BaseEmptyAmmoRecipe + id: MagazineMagnumEmpty + result: MagazineMagnumEmpty + materials: + Steel: 25 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnum + result: MagazineMagnum + materials: + Steel: 145 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumUranium + result: MagazineMagnumUranium + materials: + Steel: 25 + Plastic: 65 + Uranium: 120 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumRubber + result: MagazineMagnumRubber + materials: + Steel: 25 + Plastic: 80 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: SpeedLoaderMagnumRubber + result: SpeedLoaderMagnumRubber + materials: + Steel: 50 + Plastic: 60 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunRubber + result: MagazinePistolSubMachineGunRubber + materials: + Steel: 60 + Plastic: 160 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifleRubber + result: MagazineRifleRubber materials: - Plastic: 10 - Steel: 5 + Steel: 125 + Plastic: 125 - type: latheRecipe - id: CartridgeRifleRubber - result: CartridgeRifleRubber + parent: BaseAmmoRecipe + id: MagazineLightRifleRubber + result: MagazineLightRifleRubber + materials: + Steel: 175 + Plastic: 150 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineLightRifleBoxUranium + result: MagazineLightRifleBoxUranium + materials: + Steel: 300 + Plastic: 900 + Uranium: 900 + +- type: latheRecipe + id: BoxShotgunFlare + result: BoxShotgunFlare category: Ammo - completetime: 2 + completetime: 25 materials: - Plastic: 10 - Steel: 5 + Steel: 150 + Plastic: 150 - type: latheRecipe id: MagazineBoxPistolRubber @@ -116,13 +185,13 @@ Plastic: 600 - type: latheRecipe - id: ShellShotgunBeanbag - result: MagazineBoxLightRifleRubber - category: Ammo - completetime: 5 + parent: BaseAmmoRecipe + id: MagazineShotgunUranium + result: MagazineShotgunUranium materials: - Steel: 350 - Plastic: 600 + Steel: 50 + Plastic: 80 + Uranium: 80 - type: latheRecipe id: MagazineM16A4 @@ -156,6 +225,14 @@ materials: Steel: 1465 +- type: latheRecipe + id: MagazineLightRifleBox + result: MagazineLightRifleBox + category: Ammo + completetime: 5 + materials: + Steel: 1465 + - type: latheRecipe id: MagazineNewVector result: MagazineNewVector @@ -194,7 +271,7 @@ category: Ammo completetime: 5 materials: - Steel: 1645 + Steel: 700 - type: latheRecipe id: MagazineScorpion @@ -250,7 +327,7 @@ category: Ammo completetime: 5 materials: - Steel: 505 + Steel: 850 - type: latheRecipe id: MagazineDragunov @@ -313,10 +390,10 @@ id: ClothingHeadHelmetPubg result: ClothingHeadHelmetPubg category: Weapons - completetime: 8 + completetime: 18 materials: - Steel: 3000 - Glass: 1500 + Steel: 2000 + Glass: 800 Plastic: 300 - type: latheRecipe @@ -330,14 +407,30 @@ Plasma: 300 Silver: 200 +- type: latheRecipe + id: MagazinePistolHighCapacity + result: MagazinePistolHighCapacity + category: Weapons + completetime: 5 + materials: + Steel: 170 + +- type: latheRecipe + id: MagazinePistolHighCapacityEmpty + result: MagazinePistolHighCapacityEmpty + category: Weapons + completetime: 5 + materials: + Steel: 30 + - type: latheRecipe id: BaseMagazinePistolCaselessRifleExtended result: BaseMagazinePistolCaselessRifleExtended category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 350 + Plastic: 200 - type: latheRecipe id: MagazinePPSH41Extended @@ -345,8 +438,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1200 - type: latheRecipe id: MagazineMP5Extended @@ -354,8 +446,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 600 - type: latheRecipe id: MagazineMP7Extended @@ -363,8 +454,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 600 - type: latheRecipe id: MagazineP90Extended @@ -372,8 +462,8 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1400 + Plastic: 50 - type: latheRecipe id: MagazineM16A4Extended @@ -381,8 +471,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 650 - type: latheRecipe id: MagazineAR18Extended @@ -390,8 +479,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 650 - type: latheRecipe id: MagazineM28Extended @@ -399,8 +487,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 650 - type: latheRecipe id: MagazineG36Extended @@ -408,8 +495,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 650 - type: latheRecipe id: MagazineFamasExtended @@ -417,8 +503,7 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 650 - type: latheRecipe id: MagazineV31Extended @@ -426,8 +511,8 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1300 + Plastic: 100 - type: latheRecipe id: MagazineBauer127Extended @@ -435,8 +520,8 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1200 + Plastic: 50 - type: latheRecipe id: MagazineBR64Extended @@ -444,8 +529,8 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1000 + Plastic: 50 - type: latheRecipe id: MagazineDragunovExtended @@ -453,5 +538,4 @@ category: Weapons completetime: 12 materials: - Steel: 3000 - Plastic: 3000 + Steel: 1200 diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index 8664927d514..3cd5ea04fb0 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -52,3 +52,19 @@ - WeaponEnergyGunPistol technologyPrerequisites: - ExperimentalBatteryAmmo + +- type: technology + id: CombatPowerCell + name: research-technology-combat-powercells # + icon: + sprite: Objects/Power/power_cells.rsi + state: combat + discipline: Arsenal + tier: 2 + cost: 7500 + recipeUnlocks: + - PowerCellCombat + - PowerCellHyper + technologyPrerequisites: + - ExperimentalBatteryAmmo + - AdvancedPowercells \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ussp_roles.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ussp_roles.yml index 85420317656..e263e8344f2 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ussp_roles.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ussp_roles.yml @@ -91,9 +91,9 @@ pocket2: Gauze storage: back: - - WeaponSubMachineGunPPSH41 - - MagazinePPSH41 - - MagazinePPSH41 + - MedkitFilled + - GrenadeShrapnel + - SmokeGrenade - Crowbar - ClothingPantsManCommie