From e528643d7d7c4878124745372e640a0155d6966c Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 12 Dec 2024 17:30:21 +0000 Subject: [PATCH 1/9] Meowler --- Resources/Prototypes/Damage/modifier_sets.yml | 24 ++--- .../Entities/Objects/Specific/Mech/mechs.yml | 69 ++++++++----- .../Weapons/Guns/Projectiles/hitscan.yml | 3 +- .../Mech/mecha.rsi/meowler-broken.png | Bin 0 -> 1208 bytes .../Specific/Mech/mecha.rsi/meowler-open.png | Bin 0 -> 1975 bytes .../Specific/Mech/mecha.rsi/meowler.png | Bin 0 -> 8198 bytes .../Objects/Specific/Mech/mecha.rsi/meta.json | 95 ++++++++++++++++++ .../mech_spraycans/mauler.rsi/meowler-cap.png | Bin 0 -> 476 bytes .../Fun/mech_spraycans/mauler.rsi/meta.json | 17 ++++ .../mech_spraycans/mauler.rsi/syndiegax.png | Bin 0 -> 395 bytes 10 files changed, 169 insertions(+), 39 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png create mode 100644 Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png create mode 100644 Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png create mode 100644 Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meowler-cap.png create mode 100644 Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Fun/mech_spraycans/mauler.rsi/syndiegax.png diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index c8f33f0da3..e8f37f01bb 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -385,11 +385,11 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.65 + Piercing: 0.55 Shock: 1.8 - Heat: 0.7 + Heat: 0.8 flatReductions: - Blunt: 8 + Blunt: 10 Heat: 10 - type: damageModifierSet @@ -399,31 +399,31 @@ Slash: 0.5 Piercing: 0.35 Shock: 2.8 - Heat: 0.6 + Heat: 0.75 flatReductions: Blunt: 15 Heat: 15 - type: damageModifierSet - id: MediumArmorSyndi + id: MediumArmorSyndi #40 40 50 -180 20 coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.6 + Piercing: 0.5 Shock: 1.8 - Heat: 0.75 + Heat: 0.8 flatReductions: Blunt: 8 - Heat: 5 + Heat: 8 - type: damageModifierSet - id: HeavyArmorSyndi + id: HeavyArmorSyndi #50 50 60 -280 25 coefficients: Blunt: 0.5 Slash: 0.5 Piercing: 0.4 Shock: 2.8 - Heat: 0.7 + Heat: 0.75 flatReductions: - Blunt: 10 - Heat: 7 + Blunt: 14 + Heat: 14 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 337b6c5ec5..cfb624b6d5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -229,7 +229,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 320: Critical + 400: Critical showOverlays: false allowRevives: true @@ -277,8 +277,8 @@ types: Blunt: 20 - type: MovementSpeedModifier - baseWalkSpeed: 1 - baseSprintSpeed: 2 + baseWalkSpeed: 1.5 + baseSprintSpeed: 2.2 - type: Damageable damageModifierSet: MediumArmorNT - type: Reflect @@ -296,7 +296,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 400: Critical + 520: Critical showOverlays: false allowRevives: true @@ -358,7 +358,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 320: Critical + 380: Critical showOverlays: false allowRevives: true - type: PointLight @@ -625,11 +625,11 @@ attackRate: 1 damage: types: - Blunt: 25 + Blunt: 30 Structural: 180 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseSprintSpeed: 3.5 - type: Reflect reflectProb: 0.20 spread: 180 @@ -640,7 +640,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 450: Critical + 560: Critical showOverlays: false allowRevives: true - type: Tag @@ -691,11 +691,11 @@ attackRate: 1 damage: types: - Blunt: 40 + Blunt: 50 Structural: 250 - type: MovementSpeedModifier baseWalkSpeed: 1.5 - baseSprintSpeed: 2 + baseSprintSpeed: 2.5 - type: Damageable damageModifierSet: MediumArmorNT - type: CanMoveInAir @@ -710,7 +710,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 650: Critical + 770: Critical showOverlays: false allowRevives: true - type: Tag @@ -779,7 +779,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 280: Critical + 300: Critical showOverlays: false allowRevives: true - type: Tag @@ -833,11 +833,11 @@ attackRate: 1 damage: types: - Blunt: 30 + Blunt: 35 Structural: 200 - type: MovementSpeedModifier baseWalkSpeed: 2.4 - baseSprintSpeed: 3 + baseSprintSpeed: 3.6 - type: Reflect reflectProb: 0.20 spread: 180 @@ -846,13 +846,20 @@ - NonEnergy - type: Damageable damageModifierSet: MediumArmorNT + - type: CanMoveInAir + - type: MovementAlwaysTouching - type: MobThresholds currentThresholdState : Alive thresholds: 0: Alive - 450: Critical + 570: Critical showOverlays: false allowRevives: true + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - Gygax - type: entity id: MechNTGygaxBattery @@ -873,8 +880,8 @@ startingEquipment: - WeaponMechChainSword - WeaponMechCombatPulseRifle - - WeaponMechCombatXray - - WeaponMechCombatMissileRack6 + - WeaponMechCombatHeavyRifle + - WeaponMechCombatMissileRack8 # Marauder - type: entity @@ -909,7 +916,7 @@ attackRate: 1 damage: types: - Blunt: 40 + Blunt: 55 Structural: 350 - type: MovementSpeedModifier baseWalkSpeed: 1 @@ -928,7 +935,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 700: Critical + 800: Critical showOverlays: false allowRevives: true @@ -951,7 +958,7 @@ startingEquipment: - WeaponMechChainSword - WeaponMechCombatPulseRifle - - WeaponMechCombatUltraRifle + - WeaponMechCombatHeavyRifle - WeaponMechCombatMissileRack8 # Seraph @@ -1072,7 +1079,7 @@ Structural: 280 - type: MovementSpeedModifier baseWalkSpeed: 2.2 - baseSprintSpeed: 3.7 + baseSprintSpeed: 3.8 - type: Damageable damageModifierSet: MediumArmorSyndi - type: CanMoveInAir @@ -1087,9 +1094,14 @@ currentThresholdState : Alive thresholds: 0: Alive - 500: Critical + 580: Critical showOverlays: false allowRevives: true + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - Gygax - type: entity id: MechGygaxSyndieBattery @@ -1144,11 +1156,11 @@ attackRate: 1 damage: types: - Blunt: 40 + Blunt: 50 Structural: 380 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseSprintSpeed: 2.8 - type: Damageable damageModifierSet: MediumArmorSyndi - type: CanMoveInAir @@ -1163,7 +1175,7 @@ currentThresholdState : Alive thresholds: 0: Alive - 650: Critical + 780: Critical showOverlays: false allowRevives: true @@ -1220,7 +1232,7 @@ attackRate: 1 damage: types: - Blunt: 50 + Blunt: 60 Structural: 450 - type: MovementSpeedModifier baseWalkSpeed: 1 @@ -1242,6 +1254,11 @@ 800: Critical showOverlays: false allowRevives: true + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - Mauler - type: entity id: MechMaulerSyndieBattery diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 0d023de377..0dc9c20d39 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -136,7 +136,8 @@ id: BulletMagnum damage: types: - Blunt: 35 + Piercing: 27 + Blunt: 8 collisionMask: BulletImpassable reflective: NonEnergy bulletTracer: diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png new file mode 100644 index 0000000000000000000000000000000000000000..50cb61b60698b55aab96849045a47e62b71285e1 GIT binary patch literal 1208 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json index 7cc8980369..a751f9a488 100644 --- a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json @@ -218,6 +218,101 @@ { "name": "mauler-broken" }, +{ + "name": "meowler", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "meowler-open", + "delays": [ + [ + 0.5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "meowler-broken" + }, { "name": "odysseus", "directions": 4 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/meowler-cap.png new file mode 100644 index 0000000000000000000000000000000000000000..9cfad3c7954f16a4d74204421bf3b06b573b95f3 GIT binary patch literal 476 zcmV<20VDp2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dYx0K~z{r?Uu1h z#6S>+=foy>kTe#`6^f@K7D2GI6l>o?g!5^%@hL3qd;<%MfLe$W1BV7|3?_t-K+H^b z%_0GJmZ*sNV3^S9l|!?`@T@WguAsx zVOR!1K((c1m-PxFto=gJz`|%zTs1sTpCEdDgGb-{-X54d)OozVN};kjeGy6@qu+tk zJ5Q(vX^acoz{yITkH;1TnvsTXM)Q<87_Gp;nk!U;G{(iq0CIGnQlObOL%J9@VH%Z2(WZTd(;KC^0z+5%vcppU-}i$$NSL0Nw#Xg0Up= StyRbX0000+jwF#2KLQ6a02#TV$txaCQH?Z*qu8>sPij6jDe1Iqz@$!Sh z9U+N}E3HT~j+gBL85(#5_Q7{?-hs)Dw^3D`wmi z=PC z1pr!&7U{Z&t5{F816KL6ub2eo4p^x$<|7;!&j8duW%3vwJK!{x>WMm#U0CibCPB1> z0DImf0Cq>F(Gt~B?!Zs8PS@4{2YLzh5)S1u8ifBRAh~dcD&RWBP^oy^6L0%Iu2WQc pi~uMnbeNr6{PqNs9Inv-yaVu{b;e(qSAqZl002ovPDHLkV1jHvq&ffq literal 0 HcmV?d00001 From a073256ee0e1599b861dbde7dfdc133bd13482d6 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 12 Dec 2024 22:43:15 +0000 Subject: [PATCH 2/9] 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 c6d2dee8b7..b2bba7bd35 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 9b35043898..d479286fe2 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 b4560eb3e1..e862e2e14a 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 3a04bf1cfc..3fe1a6f382 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 930fcab8b7..0f48170c87 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 94fe61def8..51a7c144d2 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 c6fd0c7644..ff8e2a0d19 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 cd02472a3f..4eee842755 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 5001e8d60c..c2053945a7 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 cfb624b6d5..93dba01af3 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 3ca4a8c917..7b95288973 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 82c7b96aff..f830d8ab61 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 a9f3c5a1cc..daba3352eb 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 b315b04774..12eedb79e6 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 434f491a3f..009be8b549 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 c0d2582c2b..604c3984e7 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 8e62d42179..2480f01fa6 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 932345e2cd..cf9cf72d63 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 6a9e93388b..8585f28bf7 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 56f27f20c5..3935fc3f55 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 abdcd5f153..530f6f9a22 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 e434ffc603..7862aa10dc 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 39b20698cf..2098c42ffd 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 72819c7ece..4e7ed915a1 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 10c0ecd7b0..a53a3d853e 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 c46dc0fcd1..9be9d2ab6b 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 9b7aee37e7..bb00f81770 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 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 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 058bd9e991..639c57e7d1 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 From aea1b05c610ad61f0db0d9dfaef862f001bfb358 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 10:27:35 +0000 Subject: [PATCH 3/9] Fix Linter --- .../Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml index 2480f01fa6..d268ac015a 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml @@ -31,9 +31,9 @@ - type: cargoProduct id: SecurityReflective icon: - sprite: Clothing\OuterClothing\Armor\armor_reflec.rsi + sprite: Clothing/OuterClothing/Armor/armor_reflec.rsi state: icon product: CrateSecurityArmorReflective - cost: 4600 + cost: 4000 category: cargoproduct-category-name-security group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index f44e45a1d4..59315833bd 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -380,7 +380,7 @@ types: Piercing: 38 Structural: 15 - staminaDamage: 5 + staminaDamage: 5 collisionMask: BulletImpassable reflective: NonEnergy bulletTracer: From a3efab22f4f87bab7f2cb1a00cec2243162c77a9 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 10:51:05 +0000 Subject: [PATCH 4/9] Cell --- .../Entities/Objects/Power/powercells.yml | 61 +++++++++++++++++- .../Objects/Power/power_cells.rsi/combat.png | Bin 0 -> 333 bytes .../Objects/Power/power_cells.rsi/meta.json | 9 +++ .../Power/power_cells.rsi/nanotrasen.png | Bin 0 -> 301 bytes .../Power/power_cells.rsi/syndicate.png | Bin 0 -> 301 bytes 5 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/combat.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml index 386ff2199d..c4960fd5bb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml @@ -1,6 +1,6 @@ - type: entity name: syndicate power cell - description: A rechargeable standardized power cell. This one looks like a rare and powerful prototype. + description: A rechargeable standardized power cell. This one looks like a rare and powerful Syndicate combat variant. id: PowerCellSyndicate suffix: Full parent: BasePowerCell @@ -8,7 +8,7 @@ - type: Sprite layers: - map: [ "enum.PowerCellVisualLayers.Base" ] - state: hyper + state: syndicate - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded @@ -16,3 +16,60 @@ maxCharge: 2800 startingCharge: 2800 - type: EmpImmune + +- type: entity + name: ERT power cell + description: A rechargeable standardized power cell. This one looks like a rare and powerful NanoTrasen combat variant. + id: PowerCellNanoTrasen + suffix: Full + parent: BasePowerCell + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: nanotrasen + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 2800 + startingCharge: 2800 + - type: EmpImmune + +- type: entity + name: combat power cell + description: A rechargeable standardized power cell. This one looks like a rare combat variant. + id: PowerCellCombat + suffix: Full + parent: BasePowerCell + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: combat + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 2700 + startingCharge: 2700 + - type: EmpImmune + +- type: entity + name: combat power cell + description: A rechargeable standardized power cell. This one looks like a rare combat variant. + id: PowerCellPowerCellCombatPrinted + suffix: Full + parent: BasePowerCell + components: + - type: Sprite + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: combat + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 2700 + startingCharge: 0 + - type: EmpImmune diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/combat.png b/Resources/Textures/Objects/Power/power_cells.rsi/combat.png new file mode 100644 index 0000000000000000000000000000000000000000..822b98a53848d81b1c589d363acf2341eb447c30 GIT binary patch literal 333 zcmV-T0kZyyP)Px$2T4RhR9J=Wl0QpAVHC!HMty)naZVzXBralb9mFLrMi2&m25q=sAusCI{6hLI zT*S>q$DGooL1_sE1$PG<#4=F1?-jA({HFKM!+D-_I3NguARHKFGY*E04LAo-lZnR)Wr$dQh?RjyGy`R#n!{VsT(z-8iWXLIcUi$z?|csSKw fKtT`$;a~6#vEM%kUO6Eu00000NkvXXu0mjfeGQ8J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/meta.json b/Resources/Textures/Objects/Power/power_cells.rsi/meta.json index 6ed575b6f0..25a172d7b6 100644 --- a/Resources/Textures/Objects/Power/power_cells.rsi/meta.json +++ b/Resources/Textures/Objects/Power/power_cells.rsi/meta.json @@ -25,6 +25,15 @@ { "name": "microreactor" }, + { + "name": "combat" + }, + { + "name": "nanotrasen" + }, + { + "name": "syndicate" + }, { "name": "antique" }, diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png b/Resources/Textures/Objects/Power/power_cells.rsi/nanotrasen.png new file mode 100644 index 0000000000000000000000000000000000000000..9a07516a0e19ce184ee07af0be9bba5f2d471957 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}&pllnLn2z= zPFk3E*g&9dzn|-5o<3LQi9KSuQn#XS+;X1!rB+MYUn=jS$SpQk#mP-x)>F(@oL#%x ztU%uC^||u@`SKENi4yf^aov)nbO zfmf-iV?xn!HUYss_1CsAC#>6BP^8CjB%sHyDujvcdh(p&<3Bzo9xJO>X3V`Ex8`St zU19w0+Z+rlu2+|Jmp{^)P|S9qn%^Nbbk#xTRjM^rd)3z+>Sz1g)c|DeojZsB-FnBb xtdGStPJep!FpKfI*v9wOUzwzUuKVAV-*n3STv?*}W}ufDJYD@<);T3K0RSR|d;tIe literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png b/Resources/Textures/Objects/Power/power_cells.rsi/syndicate.png new file mode 100644 index 0000000000000000000000000000000000000000..dd142fe25d18e632b2f32ffe9e01c5890c5da590 GIT binary patch literal 301 zcmV+|0n+}7P)Px#=Sf6CR9J=WlRb{YFc3x`h-xJl(?v9q(nUg4+`<-zqTxP~-R=oOwW5VoQ7Dj7 z(L%#dw9@XzL5MBpRbzQP-#7Lc6h%>#H#6#+Xstcp;wE?!>+X9#G&q~Et||cL+imZ< z Date: Fri, 13 Dec 2024 11:01:04 +0000 Subject: [PATCH 5/9] =?UTF-8?q?=D0=9C=D1=8F=D1=83=D0=BB=D0=B5=D1=80!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../en-US/_strings/_sunrise/store/uplink-catalog.ftl | 2 ++ .../Prototypes/_Sunrise/Catalog/uplink_catalog.yml | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index 7c3e965701..72aa44c09f 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -20,6 +20,8 @@ uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Со uplink-music-boombox-name = Музыкальный набор синдиката uplink-music-boombox-desc = Содержит бумбокс синдиката и несколько кассет к нему. +uplink-mechpaint-mauler-name = балончик крски "МЯУЛЕР" +uplink-mechpaint-mauler-desc = Содержит краску для Маулера. Превратите огромного МЕХа в милого котика!. ## Clothing diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 3935fc3f55..e9ea5504aa 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -434,6 +434,16 @@ categories: - UplinkPointless +- type: listing + id: UplinkMechPaintMaulerMeowler + name: uplink-mechpaint-mauler-name + description: uplink-mechpaint-mauler-desc + productEntity: MechPaintMaulerMeowler + cost: + Telecrystal: 1 + categories: + - UplinkPointless + - type: listing id: UplinkClothingBackpackSyndie name: uplink-clothing-backpack-syndie-name From 8b8f88037e59226ba47f8b61c735921ca16e873f Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 11:08:07 +0000 Subject: [PATCH 6/9] Fix desc --- .../_sunrise/store/uplink-catalog.ftl | 2 +- .../Entities/Objects/Power/powercells.yml | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index 72aa44c09f..9b42f06371 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -20,7 +20,7 @@ uplink-magazine-siar52-desc = Магазин ПП на 30 патронов. Со uplink-music-boombox-name = Музыкальный набор синдиката uplink-music-boombox-desc = Содержит бумбокс синдиката и несколько кассет к нему. -uplink-mechpaint-mauler-name = балончик крски "МЯУЛЕР" +uplink-mechpaint-mauler-name = балончик краски "МЯУЛЕР" uplink-mechpaint-mauler-desc = Содержит краску для Маулера. Превратите огромного МЕХа в милого котика!. ## Clothing diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml index c4960fd5bb..1a6806f282 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml @@ -54,22 +54,3 @@ maxCharge: 2700 startingCharge: 2700 - type: EmpImmune - -- type: entity - name: combat power cell - description: A rechargeable standardized power cell. This one looks like a rare combat variant. - id: PowerCellPowerCellCombatPrinted - suffix: Full - parent: BasePowerCell - components: - - type: Sprite - layers: - - map: [ "enum.PowerCellVisualLayers.Base" ] - state: combat - - map: [ "enum.PowerCellVisualLayers.Unshaded" ] - state: o2 - shader: unshaded - - type: Battery - maxCharge: 2700 - startingCharge: 0 - - type: EmpImmune From 5180fe409734f65fbbaf7e1ef220ae4150272824 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 14:15:21 +0000 Subject: [PATCH 7/9] NT cell in NT Dome --- .../_Sunrise/Entities/Objects/Tools/energydome.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml index d7e12c3eca..cba98429b6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml @@ -63,10 +63,11 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellMedium + startingItem: PowerCellNanoTrasen whitelist: tags: - - PowerCell + - PowerCell + - PowerCellNanoTrasen - type: EnergyDomeGenerator damageEnergyDraw: 3 domePrototype: EnergyDomeMediumBlue @@ -101,10 +102,11 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellMedium + startingItem: PowerCellNanoTrasen whitelist: tags: - - PowerCell + - PowerCell + - PowerCellNanoTrasen - type: EnergyDomeGenerator damageEnergyDraw: 5 domePrototype: EnergyDomeSmallBlue From faddf99f48243a4e66835f8c7e61557c8244943e Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 14:17:36 +0000 Subject: [PATCH 8/9] Special for Nuke --- Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index e9ea5504aa..8475aacfa1 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -443,6 +443,11 @@ Telecrystal: 1 categories: - UplinkPointless + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkClothingBackpackSyndie From 61de9a62e9ab6eb642e912df871180734c22be78 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Fri, 13 Dec 2024 14:23:32 +0000 Subject: [PATCH 9/9] =?UTF-8?q?=D0=9B=D0=B8=D0=BD=D1=82=D0=B5=D1=80=20?= =?UTF-8?q?=D0=B8=D0=B4=D0=B8=20=D0=BE=D1=82=20=D1=81=D1=8E=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml index cba98429b6..92d22ceb22 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml @@ -67,7 +67,6 @@ whitelist: tags: - PowerCell - - PowerCellNanoTrasen - type: EnergyDomeGenerator damageEnergyDraw: 3 domePrototype: EnergyDomeMediumBlue @@ -106,7 +105,6 @@ whitelist: tags: - PowerCell - - PowerCellNanoTrasen - type: EnergyDomeGenerator damageEnergyDraw: 5 domePrototype: EnergyDomeSmallBlue