From a073256ee0e1599b861dbde7dfdc133bd13482d6 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 12 Dec 2024 22:43:15 +0000 Subject: [PATCH] oops --- .../catalog/fills/crates/security.ftl | 4 +- .../guns/ammunition/magazines/light_rifle.ftl | 2 +- .../objects/weapons/guns/lmgs/lmgs.ftl | 2 +- .../Maps/_Sunrise/CentCommOutpostERT.yml | 6 +-- Resources/Maps/_Sunrise/Station/cog.yml | 6 +-- Resources/Maps/_Sunrise/Station/oasis.yml | 6 +-- .../Maps/_Sunrise/Station/planet_delta.yml | 4 +- .../Entities/Objects/Power/powercells.yml | 48 ++++++++++++++++-- .../Specific/Mech/Weapons/Gun/combat.yml | 34 ++++++------- .../Entities/Objects/Specific/Mech/mechs.yml | 46 ++++++++--------- .../Entities/Structures/Machines/lathe.yml | 6 ++- .../Prototypes/Recipes/Lathes/powercells.yml | 10 ++++ .../Prototypes/Recipes/Lathes/security.yml | 2 +- Resources/Prototypes/Research/arsenal.yml | 3 +- .../Prototypes/Research/experimental.yml | 1 + Resources/Prototypes/Research/industrial.yml | 5 +- .../_Sunrise/Catalog/Cargo/cargo_security.yml | 12 ++++- .../Catalog/Fills/Crates/security.yml | 15 ++++++ .../_Sunrise/Catalog/Fills/Lockers/pilot.yml | 4 +- .../_Sunrise/Catalog/uplink_catalog.yml | 18 +++---- .../Entities/Objects/Fun/mech_spray_paint.yml | 30 +++++++++++ .../Specific/Mech/Weapons/Gun/combat.yml | 20 ++++---- .../Guns/Ammunition/Magazines/light_rifle.yml | 6 +-- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 7 ++- .../Objects/Weapons/Guns/Snipers/snipers.yml | 4 +- .../_Sunrise/Recipes/Lathes/mech_parts.yml | 1 - Resources/Prototypes/_Sunrise/tags.yml | 3 ++ .../Objects/Power/power_cages.rsi/combat.png | Bin 0 -> 424 bytes .../Objects/Power/power_cages.rsi/meta.json | 9 ++++ .../Power/power_cages.rsi/nanotrasen.png | Bin 0 -> 373 bytes .../Power/power_cages.rsi/syndicate.png | Bin 0 -> 391 bytes .../Specific/Mech/mecha.rsi/meowler-open.png | Bin 1975 -> 1925 bytes .../{meowler-cap.png => mauler-meow-cap.png} | Bin .../{syndiegax.png => mauler-meow.png} | Bin Resources/migration.yml | 6 +-- 35 files changed, 221 insertions(+), 99 deletions(-) create mode 100644 Resources/Textures/Objects/Power/power_cages.rsi/combat.png create mode 100644 Resources/Textures/Objects/Power/power_cages.rsi/nanotrasen.png create mode 100644 Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png rename Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/{meowler-cap.png => mauler-meow-cap.png} (100%) rename Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/{syndiegax.png => mauler-meow.png} (100%) diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl index c6d2dee8b77..b2bba7bd35a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl @@ -3,4 +3,6 @@ ent-CrateSecurityWebbing = ящик с РПС охраны ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности. ent-CrateSecuritySWAT = ящик с бронёй SWAT - .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности. \ No newline at end of file + .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа а так же боевые перчатки. Чтобы открыть необходим уровень доступа Службы Безопастности. +ent-CrateSecurityArmorReflective = ящик с отражающей бронёй + .desc = Ящик, Содержит комплект отражающей брони. Две отражающей брони, два щита от лазеров и две энерго пушки. Чтобы открыть необходим уровень доступа Службы Безопастности. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index 9b350438981..d479286fe2b 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -11,7 +11,7 @@ ent-MagazineNewVector = магазин Вектора ent-MagazineRPD = короб РПД .desc = Короб для РПД с длинной лентой .30 винтовочных. ent-MagazineMachineGunMG42 = Короб MG-342 - .desc = Короб для MG-342 с длинной лентой .30 винтовочных. + .desc = Малый короб для MG-342 с короткой лентой .20 винтовочных. ent-MagazineLightMachineGunMG60 = Короб ПКМ .desc = Короб для ПКМ с длинной лентой .30 винтовочных. ent-MagazineVP70 = магазин пистолета VP-78 diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl index b4560eb3e11..e862e2e14af 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl @@ -3,6 +3,6 @@ ent-WeaponLightMachineGunMG60 = ПКМ-220 ent-WeaponLightMachineGunRPD = РПД-Ш .desc = РПД-Ш Где "Ш" означает Штурмовой. Вариация Ручного пулемета СССП для Штурмовых операций в космическом пространстве где приклад будет только мешать. Остаётся популярным продуктом на чёрном рынке благодаря своей низкой стоимости. Использует патрон калибра .30 винтовочный. ent-WeaponMachineGunMG42 = MG-342 - .desc = Пулемёт ОПЗ периода Второй мировой войны. Разработан в 1942 году. После войны поставки данного пулемёта возобновили в 2342 году. Использует патрон калибра .30 винтовочный. + .desc = Пулемёт ОПЗ периода Второй мировой войны. Разработан в 1942 году. После войны поставки данного пулемёта возобновили в 2342 году. Использует патрон калибра .20 винтовочный. ent-WeaponDL6902 = Пулемёт DL6902 .desc = Тяжёлый пулемёт Cybersun. Лучшая версия легендарного пулемета L6 SAW. Использует патрон калибра .30 винтовочный. diff --git a/Resources/Maps/_Sunrise/CentCommOutpostERT.yml b/Resources/Maps/_Sunrise/CentCommOutpostERT.yml index 3a04bf1cfcc..3fe1a6f3827 100644 --- a/Resources/Maps/_Sunrise/CentCommOutpostERT.yml +++ b/Resources/Maps/_Sunrise/CentCommOutpostERT.yml @@ -13317,7 +13317,7 @@ entities: - type: Transform pos: -6.5,2.5 parent: 2 -- proto: MagazineBoxAntiMaterielBig +- proto: MagazineBoxMagnum entities: - uid: 2229 components: @@ -13329,7 +13329,7 @@ entities: - type: Transform pos: -10.337909,-10.608285 parent: 2 -- proto: MagazineBoxLightRifleBig +- proto: MagazineBoxRifleBig entities: - uid: 2116 components: @@ -20400,7 +20400,7 @@ entities: - type: Transform pos: 10.526651,-7.582013 parent: 2 -- proto: WeaponLightMachineGunRPD +- proto: WeaponMachineGunMG42 entities: - uid: 2211 components: diff --git a/Resources/Maps/_Sunrise/Station/cog.yml b/Resources/Maps/_Sunrise/Station/cog.yml index 930fcab8b71..0f48170c879 100644 --- a/Resources/Maps/_Sunrise/Station/cog.yml +++ b/Resources/Maps/_Sunrise/Station/cog.yml @@ -150031,7 +150031,7 @@ entities: - type: Transform pos: -61.5,-52.5 parent: 12 -- proto: MagazineBR64Extended +- proto: WeaponLaserSvalinn entities: - uid: 31842 components: @@ -203047,7 +203047,7 @@ entities: - type: Transform pos: -22.272215,65.76165 parent: 12 -- proto: WeaponLaserSvalinn +- proto: WeaponEnergyGunPistolSecurity entities: - uid: 29287 components: @@ -203090,7 +203090,7 @@ entities: parent: 19430 - type: Physics canCollide: False -- proto: WeaponRifleBR64 +- proto: WeaponIONRifle entities: - uid: 31841 components: diff --git a/Resources/Maps/_Sunrise/Station/oasis.yml b/Resources/Maps/_Sunrise/Station/oasis.yml index 94fe61def80..51a7c144d23 100644 --- a/Resources/Maps/_Sunrise/Station/oasis.yml +++ b/Resources/Maps/_Sunrise/Station/oasis.yml @@ -114537,7 +114537,7 @@ entities: - type: Transform pos: -47.520466,-22.794298 parent: 2 -- proto: MagazineBoxAntiMateriel +- proto: WeaponLaserSvalinn entities: - uid: 21148 components: @@ -133682,7 +133682,7 @@ entities: - type: Transform pos: 47.5,-26.5 parent: 2 -- proto: SpawnMechDurand +- proto: SpawnMechRipley2 entities: - uid: 21114 components: @@ -157740,7 +157740,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponMechSpecialMousetrapMortar +- proto: MechPaintRipleyCombatRipley entities: - uid: 447 components: diff --git a/Resources/Maps/_Sunrise/Station/planet_delta.yml b/Resources/Maps/_Sunrise/Station/planet_delta.yml index c6fd0c7644c..ff8e2a0d198 100644 --- a/Resources/Maps/_Sunrise/Station/planet_delta.yml +++ b/Resources/Maps/_Sunrise/Station/planet_delta.yml @@ -172814,7 +172814,7 @@ entities: - type: Transform pos: -38.5,-35.5 parent: 2 -- proto: MagazineBoxAntiMateriel +- proto: WeaponLaserSvalinn entities: - uid: 25295 components: @@ -239682,7 +239682,7 @@ entities: - type: Transform pos: 36.47151,18.549223 parent: 2 -- proto: WeaponRifleBR64 +- proto: WeaponIONRifle entities: - uid: 36695 components: diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index cd02472a3f2..4eee8427551 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -367,7 +367,7 @@ sprite: Objects/Power/power_cages.rsi layers: - map: [ "enum.PowerCellVisualLayers.Base" ] - state: small + state: medium - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded @@ -384,7 +384,7 @@ sprite: Objects/Power/power_cages.rsi layers: - map: [ "enum.PowerCellVisualLayers.Base" ] - state: small + state: high - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded @@ -392,6 +392,25 @@ - type: Battery startingCharge: 0 +- type: entity + id: PowerCageCombat + parent: BasePowerCage + name: Combat power cage + description: A rechargeable power cage for big devices. Increased capacity for increased power levels. + components: + - type: Sprite + sprite: Objects/Power/power_cages.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: combat + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 7800 + startingCharge: 7800 + - type: EmpImmune + - type: entity id: PowerCageSyndicate parent: BasePowerCage @@ -402,11 +421,30 @@ sprite: Objects/Power/power_cages.rsi layers: - map: [ "enum.PowerCellVisualLayers.Base" ] - state: high + state: syndicate - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded - type: Battery - maxCharge: 8000 - startingCharge: 8000 + maxCharge: 12400 + startingCharge: 12400 - type: EmpImmune + +- type: entity + id: PowerCageERT + parent: BasePowerCage + name: NanoTrasen combat power cage + description: A rechargeable power cage for big devices. Increased capacity for increased power levels. Immune to EMP. + components: + - type: Sprite + sprite: Objects/Power/power_cages.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: nanotrasen + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 12400 + startingCharge: 12400 + - type: EmpImmune \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 5001e8d60c9..c2053945a74 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -17,7 +17,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - type: HitscanBatteryAmmoProvider proto: BulletPulse # Sunrise-Edit - fireCost: 50 + fireCost: 65 - type: Appearance - type: AmmoCounter @@ -40,7 +40,7 @@ path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: HitscanBatteryAmmoProvider proto: BulletRedHeavyLaser # Sunrise-Edit - fireCost: 45 + fireCost: 50 - type: Appearance - type: AmmoCounter @@ -55,7 +55,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_antimatrifle - type: Gun - fireRate: 2 + fireRate: 1.4 selectedMode: FullAuto availableModes: - FullAuto @@ -63,7 +63,7 @@ path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg - type: ProjectileBatteryAmmoProvider proto: CartridgeAntiMateriel - fireCost: 45 + fireCost: 80 - type: Appearance - type: AmmoCounter @@ -136,7 +136,7 @@ variation: 0.2 - type: ProjectileBatteryAmmoProvider proto: TeslaGunBullet - fireCost: 35 + fireCost: 55 - type: Appearance - type: AmmoCounter @@ -151,7 +151,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_disabler - type: Gun - fireRate: 1.2 + fireRate: 1.3 selectedMode: SemiAuto availableModes: - SemiAuto @@ -159,7 +159,7 @@ path: /Audio/Weapons/Guns/Gunshots/taser2.ogg - type: HitscanBatteryAmmoProvider proto: BulletDisablerSmgSpread - fireCost: 20 + fireCost: 45 - type: Appearance - type: AmmoCounter @@ -205,7 +205,7 @@ path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - type: ProjectileBatteryAmmoProvider proto: ShellShotgun - fireCost: 40 + fireCost: 50 - type: Appearance - type: AmmoCounter @@ -220,7 +220,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_carbine - type: Gun - fireRate: 1.6 + fireRate: 1.5 selectedMode: FullAuto availableModes: - FullAuto @@ -228,7 +228,7 @@ path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - type: ProjectileBatteryAmmoProvider proto: ShellShotgunIncendiary - fireCost: 45 + fireCost: 75 - type: Appearance - type: AmmoCounter @@ -309,7 +309,7 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: HitscanBatteryAmmoProvider proto: BulletSyndiPlasmaDouble # Sunrise-Edit - fireCost: 10 + fireCost: 25 - type: Appearance - type: AmmoCounter @@ -347,7 +347,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_missilerack - type: Gun - fireRate: 1.3 + fireRate: 1.2 selectedMode: FullAuto availableModes: - FullAuto @@ -355,7 +355,7 @@ path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - type: ProjectileBatteryAmmoProvider proto: BulletWeakRocket - fireCost: 50 + fireCost: 80 - type: Appearance - type: AmmoCounter @@ -370,7 +370,7 @@ sprite: Objects/Specific/Mech/mecha_equipment.rsi state: mecha_missilerack_six - type: Gun - fireRate: 0.4 + fireRate: 0.20 selectedMode: SemiAuto availableModes: - SemiAuto @@ -378,12 +378,12 @@ path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - type: ProjectileBatteryAmmoProvider proto: GrenadeBlast - fireCost: 160 + fireCost: 260 - type: Appearance - type: AmmoCounter - type: Battery - maxCharge: 500 - startingCharge: 500 + maxCharge: 600 + startingCharge: 600 - type: entity id: WeaponMechCombatFlashbangLauncher diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index cfb624b6d54..93dba01af31 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -76,12 +76,12 @@ joinSystem: true - type: DoAfter - type: Repairable - doAfterDelay: 2 + doAfterDelay: 1 damage: types: - Blunt: -15 - Slash: -15 - Piercing: -15 + Blunt: -10 + Slash: -10 + Piercing: -10 - type: UserInterface interfaces: enum.MechUiKey.Key: @@ -241,7 +241,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageSmall + - PowerCageMedium # Ripley MK-II - type: entity @@ -308,7 +308,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageSmall + - PowerCageMedium # Clarke - type: entity @@ -381,7 +381,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageSmall + - PowerCageMedium # H.O.N.K. - type: entity @@ -434,7 +434,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageSmall + - PowerCageMedium - type: entity parent: MechHonkerBattery @@ -657,7 +657,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageHigh + - PowerCageCombat # Durand - type: entity @@ -727,7 +727,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageHigh + - PowerCageCombat # Phazon @@ -869,7 +869,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageHigh + - PowerCageERT - type: entity id: MechNTGygaxFilled @@ -947,7 +947,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageHigh + - PowerCageERT - type: entity id: MechMarauderFilled @@ -1004,7 +1004,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.4 + reflectProb: 0.30 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -1025,7 +1025,7 @@ - type: ContainerFill containers: mech-battery-slot: - - PowerCageHigh + - PowerCageERT - type: entity id: MechSeraphFilled @@ -1036,9 +1036,9 @@ startingEquipment: - WeaponMechChainSword - WeaponMechCombatPulseRifle - - WeaponMechCombatShotgun + - WeaponMechCombatVindictor - WeaponMechCombatMissileRack6 - - WeaponMechCombatUltraRifle + - WeaponMechCombatDuster # Syndicate Combat Mech @@ -1166,7 +1166,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.30 + reflectProb: 0.25 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: @@ -1242,11 +1242,16 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect - reflectProb: 0.30 + reflectProb: 0.25 spread: 180 soundOnReflect: /Audio/Weapons/block_metal1.ogg reflects: - NonEnergy + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - Mauler - type: MobThresholds currentThresholdState : Alive thresholds: @@ -1254,11 +1259,6 @@ 800: Critical showOverlays: false allowRevives: true - - type: Tag - tags: - - DoorBumpOpener - - FootstepSound - - Mauler - type: entity id: MechMaulerSyndieBattery diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 3ca4a8c917c..7b95288973c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -368,6 +368,7 @@ - MechPhasicScanningModule - HandCraftedNVD - BasicNVD + - PowerCageCombat - PowerCageHigh - PowerCageMedium # PowerCageSmall @@ -688,6 +689,9 @@ - PhazonLLeg - PhazonRArm - PhazonRLeg + - PowerCageCombat + - PowerCageHigh + - PowerCageMedium - MechEquipmentDrill - MechEquipmentDrillDiamond - MechEquipmentKineticAccelerator @@ -697,10 +701,10 @@ - WeaponMechCombatFlashbangLauncher - WeaponMechCombatSolarisLaser - WeaponMechCombatFiredartLaser + - WeaponMechCombatUltraRifle - type: EmagLatheRecipes emagDynamicRecipes: - WeaponMechCombatImmolationGun - - WeaponMechCombatUltraRifle - WeaponMechCombatShotgun - WeaponMechCombatShotgunIncendiary - WeaponMechCombatMissileRack8 diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml index 82c7b96affa..f830d8ab613 100644 --- a/Resources/Prototypes/Recipes/Lathes/powercells.yml +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -67,3 +67,13 @@ Glass: 800 Plastic: 400 Gold: 100 + +- type: latheRecipe + id: PowerCageCombat + result: PowerCageCombat + completetime: 15 + materials: + Steel: 700 + Glass: 1200 + Plastic: 500 + Gold: 200 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index a9f3c5a1cc3..daba3352ebc 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -94,7 +94,7 @@ result: WeaponLaserSvalinn materials: Steel: 2000 - Gold: 500 + Gold: 200 #sunrise-Edit - type: latheRecipe parent: BaseWeaponRecipeLong diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index b315b047742..12eedb79e61 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -206,7 +206,7 @@ recipeUnlocks: - PowerCageRechargerCircuitboard #PowerCageSmall - - PowerCageMedium + #PowerCageMedium - MagazineGrenadeEmpty - ShellFlashArtillery - ShellBlastArtillery @@ -310,5 +310,6 @@ - DurandTargetingElectronics - WeaponMechCombatShotgun - WeaponMechCombatShotgunIncendiary + - PowerCageCombat technologyPrerequisites: - Gygax diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 434f491a3f2..009be8b5493 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -150,6 +150,7 @@ - PhazonTargetingElectronics technologyPrerequisites: - Ripley2 + - Gygax - type: technology id: GravityManipulation diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index c0d2582c2b7..604c3984e72 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -42,6 +42,7 @@ recipeUnlocks: - PowerCellHigh - TurboItemRechargerCircuitboard + - PowerCageMedium - type: technology id: MechanicalCompression @@ -191,7 +192,7 @@ state: ripleymkii discipline: Industrial tier: 2 - cost: 8000 + cost: 5000 recipeUnlocks: - RipleyMKIIHarness - RipleyUpgradeKit @@ -206,7 +207,7 @@ state: clarke discipline: Industrial tier: 2 - cost: 10000 + cost: 9000 recipeUnlocks: - ClarkeHarness - ClarkeHead diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml index 8e62d421793..2480f01fa6b 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ sprite: Clothing/Belt/securitywebbing.rsi state: icon product: CrateSecurityWebbing - cost: 2500 + cost: 1500 category: cargoproduct-category-name-security group: market @@ -26,4 +26,14 @@ product: CrateSecuritySWAT cost: 6000 category: cargoproduct-category-name-security + group: market + +- type: cargoProduct + id: SecurityReflective + icon: + sprite: Clothing\OuterClothing\Armor\armor_reflec.rsi + state: icon + product: CrateSecurityArmorReflective + cost: 4600 + category: cargoproduct-category-name-security group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml index 932345e2cdc..cf9cf72d630 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml @@ -37,4 +37,19 @@ - id: ClothingHeadHelmetSwat amount: 2 - id: ClothingHandsGlovesCombat + amount: 2 + +- type: entity + id: CrateSecurityArmorReflective + parent: CrateSecgear + name: reflective armor crate + description: Contains a reflective armor. 2 reflective armor, 2 RiotLaserShield, 2 EnergyGun. To open it, the Security Service access level is required. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorReflective + amount: 2 + - id: RiotLaserShield + amount: 2 + - id: WeaponEnergyGun amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml index 6a9e93388b5..8585f28bf7a 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/pilot.yml @@ -6,12 +6,12 @@ - type: StorageFill contents: - id: ClothingHeadsetSecurity - - id: WeaponDisabler + - id: WeaponEnergyGunPistolSecurity - id: CigarGoldCase prob: 0.25 - id: ClothingOuterHardsuitPilot - id: OxygenTankFilled - id: ClothingMaskGasPilot - - id: ComputerShuttleSecurity + # - id: ComputerShuttleSecurity "No shuttle. cry about it" - id: ClothingShoesBootsMag - id: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 56f27f20c51..3935fc3f55a 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -894,7 +894,7 @@ discountDownTo: Telecrystal: 5 cost: - Telecrystal: 7 + Telecrystal: 10 categories: - UplinkMechs conditions: @@ -913,7 +913,7 @@ discountDownTo: Telecrystal: 6 cost: - Telecrystal: 12 + Telecrystal: 10 categories: - UplinkMechs conditions: @@ -949,9 +949,9 @@ productEntity: WeaponMechCombatShotgunIncendiary discountCategory: rareDiscounts discountDownTo: - Telecrystal: 6 + Telecrystal: 7 cost: - Telecrystal: 12 + Telecrystal: 14 categories: - UplinkMechs conditions: @@ -968,9 +968,9 @@ productEntity: WeaponMechCombatUltraRifle discountCategory: rareDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 cost: - Telecrystal: 5 + Telecrystal: 4 categories: - UplinkMechs conditions: @@ -1027,7 +1027,7 @@ discountDownTo: Telecrystal: 15 cost: - Telecrystal: 28 + Telecrystal: 35 categories: - UplinkMechs conditions: @@ -1044,9 +1044,9 @@ productEntity: WeaponMechCombatUVM31 discountCategory: rareDiscounts discountDownTo: - Telecrystal: 9 + Telecrystal: 15 cost: - Telecrystal: 18 + Telecrystal: 25 categories: - UplinkMechs conditions: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml index abdcd5f153c..530f6f9a224 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml @@ -522,3 +522,33 @@ enum.OpenableVisuals.Layer: True: {state: "executioner"} False: {state: "executioner-cap"} + +#Mauler-Meowler + +- type: entity + parent: MechPaintBase + suffix: DEBUG, Mauler , Meowler + id: MechPaintMaulerMeowler + components: + - type: Sprite + sprite: _Sunrise/Objects/Fun/mech_spraycans/mauler.rsi + layers: + - state: mauler-meow-cap + map: ["enum.OpenableVisuals.Layer"] + - type: Item + sprite: _Sunrise/Objects/Fun/mech_spraycans/mauler.rsi + heldPrefix: meowler + - type: MechPaint + used: false + whitelist: + tags: + - Mauler + baseState: meowler + openState: meowler-open + brokenState: meowler-broken + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "mauler-meow"} + False: {state: "mauler-meow-cap"} diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index e434ffc6039..7862aa10dcb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -18,7 +18,7 @@ path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg - type: ProjectileBatteryAmmoProvider proto: CartridgeRifle - fireCost: 6 + fireCost: 7 - type: Appearance - type: AmmoCounter @@ -35,15 +35,15 @@ - type: Gun minAngle: -15 maxAngle: 25 - fireRate: 4 + fireRate: 6.8 selectedMode: FullAuto availableModes: - FullAuto soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/SMGs/mp38/mp38_shot.ogg - type: ProjectileBatteryAmmoProvider - proto: ShellShotgunSlug - fireCost: 7 + proto: CartridgeLightRifle + fireCost: 8 - type: Appearance - type: AmmoCounter @@ -68,7 +68,7 @@ path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - type: ProjectileBatteryAmmoProvider proto: CannonBall - fireCost: 85 + fireCost: 160 - type: Appearance - type: AmmoCounter @@ -93,7 +93,7 @@ path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - type: ProjectileBatteryAmmoProvider proto: CannonBallGrapeshot - fireCost: 35 + fireCost: 50 - type: Appearance - type: AmmoCounter @@ -118,7 +118,7 @@ path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - type: ProjectileBatteryAmmoProvider proto: CannonBallGlassshot - fireCost: 55 + fireCost: 80 - type: Appearance - type: AmmoCounter @@ -146,8 +146,8 @@ params: volume: -1 - type: HitscanBatteryAmmoProvider - proto: BulletSyndiPlasmaDouble - fireCost: 6 + proto: BulletSyndiPlasma + fireCost: 7 - type: Appearance - type: AmmoCounter @@ -170,6 +170,6 @@ path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg - type: ProjectileBatteryAmmoProvider proto: GrenadeFrag - fireCost: 140 + fireCost: 250 - type: Appearance - type: AmmoCounter diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 39b20698cf4..2098c42ffd2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -173,11 +173,11 @@ - MagazineMachineGunMG42 - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgeLightRifle # 762x39 + proto: CartridgeRifle # 556 whitelist: tags: - - CartridgeLightRifle # 762x39 - capacity: 200 + - CartridgeRifle # 556 + capacity: 75 - type: Item size: Normal - type: ContainerContainer diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 72819c7ece0..4e7ed915a19 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -144,7 +144,7 @@ - type: Gun minAngle: 30 maxAngle: 90 - fireRate: 8 + fireRate: 8.5 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/LMGs/shot.ogg params: @@ -160,14 +160,13 @@ whitelist: tags: - MagazineMachineGunMG42 - - MagazineLightRifleBox gun_chamber: name: Chamber - startingItem: CartridgeLightRifle # 762x39 + startingItem: CartridgeRifle # 556 priority: 1 whitelist: tags: - - CartridgeLightRifle # 762x39 + - CartridgeRifle # 556 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 10c0ecd7b08..a53a3d853e3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -84,7 +84,7 @@ minAngle: -20 maxAngle: -40 - type: Gun - fireRate: 3 + fireRate: 2 minAngle: 28 maxAngle: 48 soundGunshot: @@ -122,7 +122,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 0.5 + delay: 1 - type: ZoomableGun - type: ChamberMagazineAmmoProvider autoEject: true diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml index c46dc0fcd14..9be9d2ab6b0 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/mech_parts.yml @@ -72,7 +72,6 @@ Steel: 1500 Glass: 800 Silver: 250 - Diamond: 100 - type: latheRecipe id: DurandLArm diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml index 9b7aee37e7a..bb00f81770b 100644 --- a/Resources/Prototypes/_Sunrise/tags.yml +++ b/Resources/Prototypes/_Sunrise/tags.yml @@ -179,6 +179,9 @@ - type: Tag id: Gygax +- type: Tag + id: Mauler + - type: Tag id: Durand diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/combat.png b/Resources/Textures/Objects/Power/power_cages.rsi/combat.png new file mode 100644 index 0000000000000000000000000000000000000000..186a8e88b0c34200ca1c887731941d48c6eb5927 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!24znd$B+p3WC_;A2_ijBfd*V`QU*?$a}F3D z`2PPN?`%otNss=^U)gu+!;FW*%{t8Thj%~v&m%6eukoscL4hI1SEEBu->lCv&Y7`& zg5WaoH5}{;FBoPVy~lq>qHK0dBFC;o#;FJSu4T?iD6n08cthwzkvob3nrj%=KdEFp z`+x7wJ`J(=5gTVce0;n=!OZHx^XKUwIyhK2C-P~|+cW>*gojps)iV~DgfUz?ar*G# z53hMuR(LWh*edM(p~KF&hmWE4z~|}u2XiENKiQsGe#1Z~Wy05nGYrKA3{9B~Qzn?0 zm`diw>_1na`$0J{(;?f|p4o?gp^JyWi>O(RwG4|`t9}3N?@C~}{9m%?e{&7{AqBHd zGMnTCY`NSHYJfxJ0UHkwgOg>G>daXg-oP;AOO5bM^YvxW0KP)Px$FG)l}R9J=W)3Hj!P!z`Te~NSvB_=v_solgYD3pSri}nEuAvm~2`T#zJdlnx+ zbQdYOxT%Zl1qb6=Td19e-JX9?{E&`1T4$4EbFgp1}y;y+L3r+ zET8e3cwsC;Lo`Y>N`%I@TF{PUve(2Z3Iy#)?mxEJul9J5I^l9^%wN6x>^hpeUX{J2 zM>=O0#u;;_qDINdqDOgQg^FJyB<1G(lq}1p=3Un%JURwyl*Pw!JTyw`Br}&NnHH#% zIF$+2){LAFoLE1&5jCW9Y1I?f% z>q_yQBs{Gi{OATYUM|UdZade7GmJKOwk3aiVJvTl%=`=T+GNkKhFg|pS^vTp9WR7R TbY~QK00000NkvXXu0mjfEFqsR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png b/Resources/Textures/Objects/Power/power_cages.rsi/syndicate.png new file mode 100644 index 0000000000000000000000000000000000000000..0611f0cdb8403edb11ffa656649f8ad0b26ca8aa GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!1{qHm$B+p3WC_;A2_ijBfd*V`wi`BV|INQ> zuT%5C>WYd#|1Yg(TXz4%ia+(D2N{kjm~E2r(A^YQ(;(>em__06zuJGt4jegs^uX~m zY@$c`?f(8f%5Zse?pLclWe=vZ{9JS5{?x|b^2~>Se}8{4N!@>5%8wr(m1p$w{rLG) z^32(@2Xh=99oyFX@bJ`1mm7E3>}X-?kGFj2)l^IZ1|EZ_tDnm{r-UW|DA=Gt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png index acfc1758669169985fb051c09d61bac59325dd08..9bbf000c1761d4d5d1f9c4be4397dafe87f4dae5 100644 GIT binary patch delta 1897 zcmZ9Lc{JOJ7RM8*QL0i^WoE3coz~VC;fZ~XrFL2pEm~Upu8CimW(*A}UR#vbP_>O^ zETQ&gp49%(k>U|sV;|B`3BM$x=gm9ky?6h(e|+z`_kQj@_qMP%EunCy zsGBqwAW1={>jc!7PJ7NT-oB$?2g^_~&qv5vxNFOu3Mm(&H|&+yYxQ9(T(h5I@ENZD zm@ShD+f|kGj#p(IJO8Chj*%(RHUHd!D_X4;Y3mO|17#IioFh)h*n{q5z=-yM&~(07 zrv*Mo7Ml^_ve#y~&A@d?9|zYwj{79uEdAq>nV+&Y>XYXIY(C8MyaFFN)KIYh92?@* z4f5mH5))p%m@O}V#=KrX=B1LCj_u@wtj8d7f=dD)ht5Gda2y2W^#Z4GbkyO7o*sMu zkG0CXIezLf%ZV~Yj`s#*Uyjy|avhAuFK1lR7%uUvt1ghv1gx%ocNXK*9x26S=%E`P z@np~=jtiXtiIk$B1$9e;P$D4})U6L8*Gp9Tm_}F{Ro3z@TU;)?KrmG<)=Y{*w7M)s z@z=@Mk`j>!iO4S)RciKeC{j-xj_9c>s%bye%9oIC4|*QT1z}hfy83>-2x zrEN8D0~Bif;-v0u7li^+PQW$~lGJ>qC@3YdgHGyJwjzxkI>oBuTUFG~N39tU16w#YXpUbT38 zPFlG2obbndQ$={NJwY2V9bcgdnkSFF?-mtqjUNCbC8G>3^K7+>v$N6940~dIHHQ0Q zeXUAw3ULS1S}v?-dZJ;NoxXp3utt8fccRpXzFdm1X`FEj2mIGHn>0Xc^*z}l0LE(+ zXT7fJaXR?HlDRWobBJ8*4exFULqohOaGa}A74yw-d!asK&{X+>`(3UZt`JW$AHYEV<*>*Y3fzR;*y7uA8oT#NY z{Zw4L?-8f#JNi~m%E+`6Ejo}8Ha|R4*SCDP9OtyJN>$0IKtHSpy5iF3d*u$i(d`zT zJLZ{6&CK(It|1&d$+v$f<+88aVkfn3Sz&9ps(dox1KWhO${4sz7$aV5hrjUJjyf@O zF8(8X;}HhYe_sb(BhXq~ZCn!6I5;sO+C1C%e25&%AJQ@x!nd`HDW;G3BW@!Rh?1Fy zRk+%%Wqpxbx~+h*e2^OYQ(<6&BYoAdbQH~L!2sc8>k{uRxD=qy)7h36i7&xIT<>z zqMfyJ?iBPWvGI&uz{QAUHEIAicm;pz)!*!No|M;-Htl1`p;Py-x!5Np`T0wFq{=y) zbH&VV5LaHiLDPSEut}oj5GCj?Z;Fo&tx9_%^ievunCQPu37b8AnIsk!D*#3Ne}oSOZuEP7SBu-k6-7oAkVW$%8~z$Z%u|D?v+ zS@2!DRIdCx0PY%a;KZn=x^2(_Ta=YgnzPf(3T4%aC&Sk~iS* z^U+7JDEbR7zVJVi3I|$-EZ!IBIL*a(tT35hlnW)0jmX97Z&mEEpl2Zt%WW2CQO8oo zg|HrrYcjIo2xK%C^j%ydG8lTPP;@kz!4{18_uEDdfXp^7ATcB>hwKZ+a+b#nH1&Fe zv7MjM2%v}hEh~p^#PWXrLBU}Io?y!Qi|Pa+h-nX)jDeG~&PTA3|Ka;DWcUAP|0^aj zDvK%1ScPl35SRjaZ%Y6cjOZ>3LajW_u}nbe;iG z&kT&Yg}mhMUwsB;BOJe0>a*kGnHl4H-kOh*i-8{UcfK|~$A#p&O9J>xH6pUdO}tkY z(m`xWP?R=_!t}CCWcew1d7fJep~YBv z4_i;gLM(am(u~VhE_;e=Sh!+V*vxi!?m3-%&i(%L{hZI|obTsz&gYwo5FqZ`fmgiT zT>awk-#5IQl~VAyAe}(qHWFQSa|mcwW6GgXf?kJVzd}`(ROq$DD_vb!uUFogKPM|Y zv#|P3mdMKrTr-fj7%GX|A!+Re$--e_9n2-3RkPSI*IZHGhCAIAy`{}RDTMs@xg`tN z9W+UO4sJshBKdo-78p&~UL-49oQj-a8Px0x)Q{LfyAx9&>ax&5WW8bKI4gAuVVfN6-3^h7)*AH!s^`` z_~{CIAKT|LI(>-V9`Agns+Acfkl?o&FnQw^M&pe(KuRkB|h0sN4V(G^mW z%#Q5?41~x*qSy6~E4qsz-0+~2dG9V0{EecBLdXDXM%8e!U4XCujMzc7gnW5*- zI3fpmY|$*!+)HXmkCEKz2pgWQpI%LUeCP$t^ zLejw3+GHbbQjbPMx|U24w87^_Cety+iq;hYB{F;jK_E;OVqRSk~-K& z5TGa>%(E5|fzevSjZ5H4)j^h8GIAwWZJ&EFac14oqOWD6;?)};Vlzs~2To3x`b-Q$ z98SHk_NK0fRQ>{WcpcnB=j;;G9dl;4bz{gT?`Qu6xe+Pl3R9~CHCY=(x{~Ex4@#u@ z=;ET9Ba*o#6T|eVM|^Lred0(`TP?b+@fw?&{-MKnrRa+{5A;L!z5aYwXPjQ*H~pfS znKJo3@6nMcnMHQRfT|Yf^XUjyVVWKP5B#YJ7H{Th@ZF>3=+ug;SY1vz1&4vrgBMZl zJ*#juYsCOZ4aKwhpW&}~)ubnJP2!;;le_KJdGG6EVAF9;QIMGmTIt8`P*Mol$*JVi z#p)Zp8E}kXn7IB`i+RLe>O^7qW3P|4&b@8Vt?Pu6+0E`*#CqTQm}-Xy7X_lr1Rt~g zxm0+Rz4ukLB@>?U%^mwtaQ?-R_4lBQp835&74P&P_o<29)a|0|sj+uAuSc>NjO<3I z@vPsTWDqicm7ZietE5}kLM$z3JoR@ZM8?=t9YEKXIq%SOCt`>kY=3)~_wA`zeeOrX zIa3;uql@Ocky|Wy#dQmW<>RVSk5gvdcoi;HnC-#zwKer0Kn4=hL;D;qLN>uadtSdHeS z95qb(mt0=1*w@iPUfUuv#%TR;W6?JINo2^yh;gBw#{g)<1_K7QflBDO=c^1pRUNLF z!0NyWjgt(qOoUSVPs7L}D+e!%&TwvOdk4Q9N>jAm&~R85cMZdXp(RJ zmkRg+{!eRALlVwPjZ(#?VDY6wh7xL?NLQQwAv3M&)&QMbO%d8ttd_|4|3-9fGeulN z7GJ8dUx7Np*gQ(lGONVu=NDv`dz=K$Lc6S>#(o)kC(uL<@!0PgJ`eXt0jcdW(-276 zvKH!-H+}m%#;sVH7TVb-_co*##7u6YIdOUp)5m=)+Hxuq0TBI9$Io)_-1M58U#_M; zRkE$FveYQ;YEoFP2y@w8uJkx@&<1=H@J{C>c#E00sYYsmoB(|=xohuT@*Dr$b`0(5 z`%wfgxNIK&u%>?*>Jz|Tg?LofXn-*P>)@Lvp02EChi4Hu*YHKS@nd@x^v>}iHKe_Y dt^uUqP}DxOtue*#*9t&4Uhckbyo0n`{{bc=)^h*= diff --git a/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meowler-cap.png b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow-cap.png similarity index 100% rename from Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meowler-cap.png rename to Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow-cap.png diff --git a/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/syndiegax.png b/Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow.png similarity index 100% rename from Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/syndiegax.png rename to Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/mauler-meow.png diff --git a/Resources/migration.yml b/Resources/migration.yml index 058bd9e9915..639c57e7d1a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -492,14 +492,14 @@ AirlockHatchSyndicate: AirlockHatchSyndicateLocked SurveillanceCameraWirelessRouterBase: SurveillanceCameraWirelessRouterConstructed CryogenicSleepUnitSpawner: CryogenicSleepUnitSpawnerLateJoin WeaponLaserCannon: WeaponEarthGovLaserSniper -WeaponRifleLecter: WeaponRifleFamas +WeaponRifleLecter: WeaponRifleM16A4 WeaponDisabler: WeaponEnergyGunMini MagazinePistolSubMachineGunTopMounted: MagazineM16A4 WeaponSubMachineGunWt550: WeaponRifleM16A4 WeaponRevolverMateba: WeaponRevolverMatebaNew -WeaponSniperHristov: WeaponRifleBR64 +WeaponSniperHristov: WeaponIONRifle WeaponLaserCarbine: WeaponEarthGovLaserCarbine -WeaponPistolMk58: WeaponPistolACP14 +WeaponPistolMk58: WeaponEnergyGunPistolSecurity WeaponRifleAk: WeaponRifleAKM WeaponRifleM90GrenadeLauncher: WeaponRifleM28 WeaponShotgunEnforcer: WeaponShotgunSPAS12