From b30c02ba1e3c17e09db5060aa310d3f6e78696ca Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Tue, 31 Dec 2024 20:41:54 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=B1=D0=BB=D1=8F=D0=B4=D1=8C=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=B8=D0=B7=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Coats/coatchristmas.rsi/{Icon.png => icon.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/{Icon.png => icon.png} (100%) diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/icon.png similarity index 100% rename from Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png rename to Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/icon.png From f5f7b3064a51f257fd0d56096f4924dc80a12474 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 31 Dec 2024 17:43:40 +0000 Subject: [PATCH 2/6] Battery Guns (#987) * LNT620 Spark * IK-60 Battery ammo, Fix Emag Protolathe * Add tech, lathe. Cargo * LNT620 Spark in ERT Uplink, increased Impulse cost --- .../_sunrise/catalog/fills/crates/armory.ftl | 2 + .../weapons/guns/battery/battery_guns.ftl | 6 +- .../_sunrise/catalog/fills/crates/armory.ftl | 2 + .../weapons/guns/battery/battery_guns.ftl | 6 +- .../Entities/Structures/Machines/lathe.yml | 3 + .../Prototypes/Recipes/Lathes/security.yml | 9 ++ Resources/Prototypes/Research/arsenal.yml | 1 + .../_Sunrise/Catalog/Cargo/cargo_armory.yml | 16 ++- .../_Sunrise/Catalog/Fills/Crates/armory.yml | 11 ++ .../_Sunrise/Catalog/ert_uplink_catalog.yml | 24 +++- .../Weapons/Guns/Battery/battery_guns.yml | 122 +++++++++++++++--- .../Prototypes/_Sunrise/Research/arsenal.yml | 2 + .../Interface/Misc/nt_icons.rsi/lnt620.png | Bin 0 -> 1854 bytes .../Interface/Misc/nt_icons.rsi/meta.json | 3 + .../Battery/batterylaser_carbine.rsi/base.png | Bin 0 -> 319 bytes .../equipped-BACKPACK.png | Bin 0 -> 338 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 760 bytes .../Battery/batterylaser_carbine.rsi/icon.png | Bin 0 -> 326 bytes .../batterylaser_carbine.rsi/inhand-left.png | Bin 0 -> 730 bytes .../batterylaser_carbine.rsi/inhand-right.png | Bin 0 -> 734 bytes .../mag-unshaded-0.png | Bin 0 -> 140 bytes .../mag-unshaded-1.png | Bin 0 -> 154 bytes .../mag-unshaded-2.png | Bin 0 -> 156 bytes .../mag-unshaded-3.png | Bin 0 -> 156 bytes .../mag-unshaded-4.png | Bin 0 -> 156 bytes .../batterylaser_carbine.rsi/meta.json | 48 +++++++ .../Guns/Battery/smg_laser.rsi/base.png | Bin 0 -> 761 bytes .../smg_laser.rsi/equipped-BACKPACK.png | Bin 0 -> 338 bytes .../smg_laser.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 760 bytes .../Guns/Battery/smg_laser.rsi/icon.png | Bin 0 -> 759 bytes .../Battery/smg_laser.rsi/inhand-left.png | Bin 0 -> 939 bytes .../Battery/smg_laser.rsi/inhand-right.png | Bin 0 -> 889 bytes .../Battery/smg_laser.rsi/mag-unshaded-0.png | Bin 0 -> 148 bytes .../Battery/smg_laser.rsi/mag-unshaded-1.png | Bin 0 -> 160 bytes .../Battery/smg_laser.rsi/mag-unshaded-2.png | Bin 0 -> 161 bytes .../Battery/smg_laser.rsi/mag-unshaded-3.png | Bin 0 -> 146 bytes .../Battery/smg_laser.rsi/mag-unshaded-4.png | Bin 0 -> 151 bytes .../Guns/Battery/smg_laser.rsi/meta.json | 48 +++++++ 38 files changed, 273 insertions(+), 30 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/lnt620.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/meta.json diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl index ad51b1830ac..ac68ad9c4f3 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/crates/armory.ftl @@ -4,6 +4,8 @@ ent-CrateArmoryAKMS = AKMS crate .desc = Contains two AKMS assault rifle with four mags. Requires Armory access to open. ent-CrateArmoryMP5 = MP5 crate .desc = Contains two MP5 submachine gun with four mags. Requires Armory access to open. +ent-CrateArmoryIK30 = IK-30 crate + .desc = Contains three IK-30 semi laser battery gun. Requires Armory access to open. ent-CrateArmoryMagazineBoxLightRifleBig = MagazineBoxLightRifleBig crate .desc = Contains two MagazineBoxLightRifleBig. Requires Armory access to open. ent-CrateArmoryMagazineBoxRifleBig = MagazineBoxRifleBig crate diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl index 5d9976ef594..06c16c18fc4 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -7,7 +7,9 @@ ent-WeaponEnergyGunMini = miniature energy gun ent-WeaponEnergyGunPistol = PDW-9 Energy Pistol .desc = A military grade sidearm, used by many militia forces throughout the local sector. ent-WeaponGunLaserCarbineAutomatic = IK-60 laser carbine - .desc = A 20 round semi-automatic laser carbine. + .desc = A semi-automatic battery laser burst carbine. +ent-WeaponGunLaserCarbineSemi = IK-30 laser carbine + .desc = A semi-automatic battery laser carbine. ent-WeaponEnergyGunPistolSecurity = Energy Pistol «Judge» .desc = A Security grade sidearm, used by many security forces throughout the local sector. Prepare to Judgement. ent-WeaponEnergyGunTactical = Tactical Energy Gun @@ -35,3 +37,5 @@ ent-WeaponSyndieLaserPistol = SAM-300 .desc = The Syndicate's laser pistol, developed from the NT Captain's pistol. ent-WeaponLaserMinigun = UVL-21 «Vivern» .desc = A heavy weapon of mass destruction based on the minigun. +ent-WeaponLaserLNT620 = LNT620 «Spark» + .desc = { ent-BaseWeaponBattery.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl index 4a6a16f6f79..27047608212 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl @@ -4,6 +4,8 @@ ent-CrateArmoryAKMS = ящик AKMS .desc = Содержит две штурмовые винтовки AKMS и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной. ent-CrateArmoryMP5 = ящик MP5 .desc = Содержит два пистолета-пулемёта MP5 и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной. +ent-CrateArmoryIK30 = ящик ИК-30 + .desc = Содержит три батарейных лазера ИК-30. Чтобы открыть необходим доступ уровня Оружейной. ent-CrateArmoryMagazineBoxLightRifleBig = ящик патронов .30 винтовочные .desc = Содержит три ящика патрон калибра .30, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной. ent-CrateArmoryMagazineBoxRifleBig = ящик патронов .20 винтовочные diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl index 131c249a46e..edb9c8a863e 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -7,7 +7,9 @@ ent-WeaponEnergyGunMini = миниатюрная энергетическая п ent-WeaponEnergyGunPistol = энергетический пистолет PDW-9 .desc = Военное оружие, используемое многими ополченцами в местном секторе. ent-WeaponGunLaserCarbineAutomatic = лазерный карабин ИК-60 - .desc = Лазерный полуавтоматический карабин на 20 патронов. + .desc = Лазерный карабин ведущий огонь очередями и используемый батарейки как источник питания. +ent-WeaponGunLaserCarbineSemi = лазерный карабин ИК-30 + .desc = Лазерный полуавтоматический карабин используемый батарейки как источник питания. ent-WeaponEnergyGunPistolSecurity = энергетический пистолет «Судья» .desc = Энерго пистолет Службы Безопасности, используемое многими правоохранительными ораганами в местном секторе. Тебя ждет Суд!. ent-WeaponEnergyGunTactical = тактическая энергетическая пушка @@ -34,3 +36,5 @@ ent-WeaponLaserMinigun = UVL-21 «Виверна» .desc = Тяжёлое оружие массового поражения разработанное на основе минигана. ent-WeaponSyndieLaserGun = S-13 «Чёрная мамба» .desc = Модернизированный «Лектер», переделаный под плазменый энергомодуль. +ent-WeaponLaserLNT620 = LNT620 «Искра» + .desc = Автоматический батарейный лазер NanoTrasen LNT620 "Искра" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 590872d8818..de888452964 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -387,6 +387,8 @@ - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber + - WeaponGunLaserCarbineSemi + - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine # Sunrise-End - BoxBeanbag - BoxShotgunIncendiary @@ -901,6 +903,7 @@ - TimerTrigger - Truncheon - VoiceTrigger + - WeaponGunLaserCarbineSemi - WeaponAdvancedLaser - WeaponDisabler - WeaponDisablerSMG diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index daba3352ebc..4b6c4f71454 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -96,6 +96,15 @@ Steel: 2000 Gold: 200 #sunrise-Edit +- type: latheRecipe + parent: BaseWeaponRecipeLong + id: WeaponGunLaserCarbineSemi + result: WeaponGunLaserCarbineSemi + materials: + Steel: 1800 + Plastic: 50 + Gold: 300 #sunrise-Edit + - type: latheRecipe parent: BaseWeaponRecipeLong id: WeaponXrayCannon diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 12eedb79e61..55e65e7ae1b 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -169,6 +169,7 @@ cost: 8000 recipeUnlocks: - WeaponLaserSvalinn + - WeaponGunLaserCarbineSemi #Sunrise-Edit - type: technology id: WaveParticleHarnessing diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml index 62e4274d8e8..91d75f56552 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml @@ -4,7 +4,7 @@ sprite: _Sunrise/Objects/Weapons/Guns/Rifles/m16a4/big.rsi state: icon product: CrateArmoryM16A4 - cost: 30000 + cost: 17500 category: cargoproduct-category-name-armory group: market @@ -14,7 +14,7 @@ sprite: _Sunrise/Objects/Weapons/Guns/Rifles/akms/big.rsi state: icon product: CrateArmoryAKMS - cost: 35000 + cost: 19800 category: cargoproduct-category-name-armory group: market @@ -24,7 +24,17 @@ sprite: _Sunrise/Objects/Weapons/Guns/SMGs/mp5/big.rsi state: icon product: CrateArmoryMP5 - cost: 15000 + cost: 12500 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: ArmoryLaserik30 + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi + state: icon + product: CrateArmoryIK30 + cost: 6500 category: cargoproduct-category-name-armory group: market diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml index f0e174abf2a..1038beb3f74 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml @@ -37,6 +37,17 @@ - id: MagazineMP5 amount: 4 +- type: entity + id: CrateArmoryIK30 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: IK-30 crate + description: Contains three IK-30 semi laser battery gun. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponGunLaserCarbineSemi + amount: 3 + - type: entity id: CrateArmoryMagazineBoxLightRifleBig parent: [ CrateWeaponSecure, BaseRestrictedContraband ] diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index c0d902c6a1b..b6f4017bbe5 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -173,7 +173,7 @@ productEntity: WeaponSniperPulseCarbine icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-sc } cost: - Bluecrystal: 15 + Bluecrystal: 18 categories: - NTLasers conditions: @@ -197,13 +197,25 @@ productEntity: WeaponPulseCarbine icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-c } cost: - Bluecrystal: 10 + Bluecrystal: 12 categories: - NTLasers conditions: - !type:ListingLimitedStockCondition stock: 4 +- type: listing + id: NTUplinkSunriseWeaponLaserLNT620 + productEntity: WeaponLaserLNT620 + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lnt620 } + cost: + Bluecrystal: 8 + categories: + - NTLasers + conditions: + - !type:ListingLimitedStockCondition + stock: 6 + - type: listing id: NTUplinkSunriseWeaponEnergyGunTactical productEntity: WeaponEnergyGunTactical @@ -214,7 +226,7 @@ - NTLasers conditions: - !type:ListingLimitedStockCondition - stock: 4 + stock: 6 - type: listing id: NTUplinkSunriseWeaponWeaponEnergyGun @@ -937,11 +949,11 @@ stock: 4 - type: listing - id: NTUplinkSunrisePowerCellHigh - productEntity: PowerCellHigh + id: NTUplinkSunrisePowerCellHyper + productEntity: PowerCellHyper icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_high } cost: - Crystallite: 1 + Crystallite: 2 categories: - NTEngineering conditions: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 48df77a7fe5..e693879e10d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -1,3 +1,90 @@ +- type: entity + id: BaseWeaponAutoPowerCell + parent: BaseWeaponPowerCell + abstract: true + components: + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Gun + fireRate: 4 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/_Sunrise/Weapons/Guns/Laser/EG_R.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: PowerCellMedium + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - PowerCell + - PowerCellMedium + +- type: entity + name: LNT620 "Spark" + parent: [ BaseWeaponAutoPowerCell, BaseRestrictedContraband ] + id: WeaponLaserLNT620 + description: "Automatic Laser NanoTrasen LNT620." + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + fireRate: 4.5 + minAngle: 5 + maxAngle: 15 + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi + - type: Item + size: Large + sprite: _Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + +- type: entity + name: IK-30 laser carbine + parent: [ BaseWeaponAutoPowerCell, BaseRestrictedContraband ] + id: WeaponGunLaserCarbineSemi + description: "A semi-automatic battery laser carbine." + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + selectedMode: SemiAuto + fireRate: 3 + availableModes: + - SemiAuto + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi + - type: Item + size: Large + sprite: _Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: entity name: energy gun parent: BaseWeaponBattery @@ -225,9 +312,9 @@ - type: entity name: IK-60 laser carbine - parent: BaseWeaponBattery + parent: [ BaseWeaponAutoPowerCell, BaseRestrictedContraband ] id: WeaponGunLaserCarbineAutomatic - description: "A 20 round semi-automatic laser carbine." + description: "A burst automatic battery laser carbine." components: - type: Sprite sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi @@ -237,29 +324,26 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: Clothing - sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi - type: Gun - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/empty.ogg - selectedMode: SemiAuto - fireRate: 3 + minAngle: 2 + maxAngle: 12 + angleIncrease: 1.5 + angleDecay: 8 + selectedMode: Burst + shotsPerBurst: 4 + burstCooldown: 0.3 + burstFireRate: 5 availableModes: - - SemiAuto - - FullAuto - - type: Battery - maxCharge: 2000 - startingCharge: 2000 - - type: HitscanBatteryAmmoProvider - proto: BulletEnergyGunLaser - fireCost: 100 + - Burst + - type: Item + size: Large + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi - type: MagazineVisuals magState: mag steps: 5 zeroVisible: true - - type: Appearance - type: entity name: Energy Pistol «Judge» diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index d8c8809ef8e..8664927d514 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -50,3 +50,5 @@ recipeUnlocks: - WeaponGunLaserCarbineAutomatic - WeaponEnergyGunPistol + technologyPrerequisites: + - ExperimentalBatteryAmmo diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/lnt620.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/lnt620.png new file mode 100644 index 0000000000000000000000000000000000000000..607666397dd427aaa72ce80165648b01663e016c GIT binary patch literal 1854 zcmV-E2f_G>P)Px*_(?=TRCt{2ox5)wMI6V!cYYjx#u;nDNw zp7hnWwpf)HH_izF-(bR)hKt%q*xpXQeb!lkupgi;0wF>u02`bH@o5onb$5Hxe;*$! z<#QkZr(6aAyjUpI%~$U}qWkgf8DS5)BcE@mJYDryZKsG4fgoqIfRvM?bpVoqEx9!<@1BCRmm$`FB9d3QGeO~6mkFL1VGIKkV`W@3n0PL?NgIJ3ozAB z#5n<=8}mMrD(3cQNrwD0k(71?Srcj(FF+!JGG+m&gH=tKEYvZ4Lsd<`uJUBj-A_Ey z0uY6U=H`nFY}AX&z=DQZk9^UgZ<&s zB>=$3PoDw+Zuj;A0KPap1OR+>;Q|2QMzQF7{>zRI06=$F7XaYX-CbSH(SmgXpv!lf z^2w&LP5=Plmn&BQ0By`4mYD@;Z*K&H!1wI$;=NY@0P7nq&b6Z>XP#rS>DS&^ zsusX3$?)*7w{2{U!1LbfYEUzcA}s*TnlP1Dqc#)Ne$)LV6aadU%txez$ z?qXwwJ0l~Wx_!8@;oHWrpywzW3#3~eGvr)=Uu>IBM4C^$`{04|f2mTzx6FbZ3*zNS zOG#@zV*sYvj*pj2J7WL_S*5YDG2b+?wzgKcZDFADyb@^vY+aX+0x1g+RkX~(!GR}D zeszhfhSh^3DJL`nvD&TU@$>Md|PsgjjX0#C13ubVwjcQZZM5HcgcgAIpsDT*3KP8V;tP4pK)!soT&}twwx7U3kf!|vFfbNSd0vTE znW)DoNhdHSFe+r@==}2K1=rDWzY+g5({!45eDvfAfSM&ZIy!2qjZY^0n< z1z=b3D;=cWG{^Tl z$7{Y_WB&74DF9(&o5u54B><$gx4GjK6-5| zxTTdrzjb^b9hx7-hFH-rg^Dm{0aPod3U#(>RI_S%sBA;-xCmBFZ0C>zh5X9eQ_hGo|K978O6-v&7H9ai8u+_vfJqY!aoAN6EoQ?mh9ZO zfl)(8`;{!)fvb;A1GuEtL}t1hSMZvuo}J+Q;iSaEcLBlX5w9&ye)E{>A8YR2^&sIs z`}#Jam9rOqk44ofy`glX(f`s08?gxJpV& zDk>@(85xPp6A={^RZ~ze-(cIbksu&l`9jTodNQBN`m}?|3d)-kbZbW zeG^dph^LEVNJQ(~Yj^pY6?j-5T;8NP`~ClY$yFCWC0{ypcG6Vu%bz_Nn@@BzGqM

wKg?kBlFP9Ez@Xstj>Wpb z_2Rlk$!y^w+`BKN-8~S&tI)u}^rB(8y4q1Dfqt$0IPLA-46|bsCe2_o`_1C!kXFsV zDv0r!TnW3WL+!_m3%nC7Z#J0xb5B}!mu<@LKn~mHv%A=;cCT8TbLaS~H`DEwF);ne af54p7SL^QBtL6yw4}+(xpUXO@geCxe0E9RI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..8800af2abce4713db92c08400b009c71e34cf706 GIT binary patch literal 760 zcmVPx%vPnciRCt{2n!#$@KoEw1m8KOw1e{XhMYxiK+XvV~x@W&ZuDbOxLh-ru& z*IsJqO{9>%Kq(eMC`y6_F#+SaOb^YvsvFl@Nmg+>ALt}@HUDUKB=%o`VHk#C7>3z= zq?8n@E}4vZSk=Qlw@m;r3{S19=FIyHAp`-y`$tzem~I=*`Jk%cTEeMns+B0E=5JX_ zNdREmHV&rSh~wC3u1XSMT6RSlhNqTJbg$Q=FQ0w-_~AKh+s3#*HWm+5kO1HJ=i=8{ z{+b{NtVW}OcW+zp-0zStkI`&4vGsZj01(HqQ4FPeKvsMZ1Zx+sSri|~v9WMX;R?u# zcZ09BiI-B+qIlc33(r?5@a&qeTf7#m#RI@>Hp9imMWHy12W2~Oon@aDKbcGb078gT z2sO|Wk9LI_&+w$n64nIzOIqzs)-hwke5 z`Y*7|GT0byE1{O3E{0(khG7_nVHk#CnE#s>p0{zkFnMFnWsKZd*4%{L1cVTDW98c- z%#{F|PLZbRMkGN>Nm=h;6-L|Qqa-O5R2_J3n_9v_7=}hxS*{8gMv>KQHnFq2TR6aV zqLiYRaBvn!a9vm1X1UftZgX^$BrBJJKEY8Zq3Y5RE&%{LPo5%45~Fhh#_n*Mrb`1c zovSRq@6+MlK7gM-<+9lRM(zaYWialK|G3xd^#}kyiO0qP6eUz$dh_iVz%Pe-+#eg2 zKakTJ(`BEgDJIv~h|kaG<3iP?SB+-?fWcr;i#??s>LXnKX3q;DNL%LsaB^}|Z9Jai zP__s7zE7d*8Xrw7gHnq0wRlfTNuJ{v#bVS0hEZfKehLrw_G>*Pq3!v*&L)hK1j8u0 q-zMq5_|h;8!!QiPFbu=oJAMF;P&M93(-yb@0000tx@?7v#?I_|v>4m+#cRc;{Q*zs>)_qG_jY z@p3c>{yL=YFiZ07R5k^tD(@>@eDA}4ZI)iNG^#7@gyNB7G7H~@oHnRLfvipMZ%R>c^+4q@Avem!4ETjc=D}$%2 KpUXO@geCwv0EvbG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b9987bf0ec04270d2e1a6775f9f856f13a787949 GIT binary patch literal 730 zcmV<00ww*4P)Px%lu1NERCt{2+A(h$F%$>zzp0pvge4RyOB|KX29{1sD#80sz8x8`n3tI6Zkrvr$|5 z)S8VNot`}7`sOw@E}U-PBPk_mttkisqRt_`6k(Y{P_t1Z>KsxK1gVSf&0K;~O3G%l zQ29KfC_?$5g-SudS_>>L0@->Um4ZO|poJ)k@bol(qkL@MJFPX9j3E#x2m(?{jla)f zj3K2I1=T8nKqX^HYwdO8&fkD({eE8nfZo-Jq6h$R7RPw42qk0aJdObXQLhKRt5b9M zvXLuADK*)!-r2$TIEHw5NIjdjx2e3fh5r5hWNa`Pyp=1DF~%5Uj4{R-V~jDz82eXN zY0>*=jg6#~BiHlJc@{}2fBruH(xRUke~t6TL&+HWxVHyEG&;Mu0DyO{pMi01fCvzc z%S&p7Vd@~0oWfnFL&M>4;URm;2ehw3hzv6J=&P5`j0q?iubT(jDYkYfroXG|(!npy)7-P(vUqNX$I6G^~(f|Me M07*qoM6N<$f_|V#SO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e00893fd3c238239689dd4b973989d8d41802376 GIT binary patch literal 734 zcmV<40wMj0P)Px%m`OxIRCt{2+A&WeK@jZ{b&gFC+yy zkVIod2Cp#L#zGPs_FZv6JVe|*77on&HJdE#^5$ij=Klc37-Nhv#u#Ia?K01k^h&~7`|d*v8_;gmsB!*`tLqzddp!WaXfzV()tWvrSKZb1 z4I1aqXt!#Kb}hAAHKP701wlYsYue^*KkwxM=y{TYARy|W(xeFs*YR=(khK<-yg>P+ z1Lqu6E{AM33n}H!G-BF>r>Bu{&Y^tLK_xF>>vdq+nNTu@lu{G~0f9gzV@PYg6N_F% zYfU9%2m}hMRZ>ckG3M2JGQgk3H^LAA;GBa#)Bu3taJbd~`(>uJ>q8AU7ytm8VTjUP z69fQIp+M!mJq+*fXCFL1KJM(|Us6iV7OW2r@G}e{9v(i#+8ASuF~%5Uj4{R-V~nlM zt|UWA#hMS0QjUxM>+D@hIo?!bq?D1AGD`cspW^&*(f7roc)aNQ;>*zy1Q0cvO@T?! zlCp9A>OGl}cd5@!bpU~xQt+wY^-?ZnRF|AjsKAw&k5-evdy%_zLJ&8MmH zTnwF>SyW#=rgbIMvCe?Eh9f5T$vKDWw;?Kdfn`~I0^@e8MwPrk_4_Zl!QIk2RuOwh zY7r@Al+9*^%H@zKi(hVRt<6;O0_CrlaD%(Q<`h<`cWvTk@o^YqBBc}s)#HuKDXg>u zrs8Jt?V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..54e4fdb73832f480e48a50e9042f59bf85d14da3 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Zk{fVArY-_ z&u!#va1dd+C|Jk5pS^nbu{Te=gnX_a;X3EgQhCyin|aa_*TpAtjJj%s3}(mto_6y+ mQ`XmtISiFylTHT(bT^Uh2R7FQ>|mEC@IQts09 z&uqbStj>9Bo|{_x_FlqkN6-E!es6Z5i63_JFPS3{=Wtq<2gqaaboFyt=akR{01YuT AkN^Mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..d3e1909a2217a182ff71ecb5294b06cea380c01d GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}VV*9IArY;~ z2@N(YTrEu%Ad3P+y<{m)k)NupvC23=Ax{M0*Stohbm?z~JfX=d#Wzp$Pzx+%VPv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b523e63744bc473526a60483a9628e2bde4f5483 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}VV*9IArY;~ z2@Px%vq?ljR9J=Wmc38gKp4h<4mK_yL1ah}$x^RCUWVoB|kkq zeOA0}+tM%$?goR2V>Ezzy`Gq&!^1;GV%xS{T3iI+Tch#f%tfWjE-dgpAq!f)UYC|- zJ(+lPbcE}=02~|~0C0PI%kuIv0Q2T7g+iXL?^DPp*sf0~?idUP6pO`)!DW2kr`>L= ztJ!SQY&HSZJHs$2l}c)IM83DTMW?`ue(BvcusJUDwIwa%1Cz zAfVgrB7~S|Bj^u=6SvAZwzjt9#>R#sF-;Q~FGEtp{SB$M;z&Rc1YBKRk;!CK^vB1? zTCG--H#axHs0Wg=38Ql&T49+q0y3G**nONFpwVb(*=+V%KM{E<0nvUD1Ob|+jS)MJ z^Q456qJNARA4U;0O(P6L6-6WhASyvT!sn2x1QFt0{1)=m0xmBvxxc?xgl{E>l&c{6 r%X!>ruO&|{ATA<~*OE^$#Xo^RR6&jF#VQEp00000NkvXXu0mjfk44ofy`glX(f`s08?gxJpV& zDk>@(85xPp6A={^RZ~ze-(cIbksu&l`9jTodNQBN`m}?|3d)-kbZbW zeG^dph^LEVNJQ(~Yj^pY6?j-5T;8NP`~ClY$yFCWC0{ypcG6Vu%bz_Nn@@BzGqM

wKg?kBlFP9Ez@Xstj>Wpb z_2Rlk$!y^w+`BKN-8~S&tI)u}^rB(8y4q1Dfqt$0IPLA-46|bsCe2_o`_1C!kXFsV zDv0r!TnW3WL+!_m3%nC7Z#J0xb5B}!mu<@LKn~mHv%A=;cCT8TbLaS~H`DEwF);ne af54p7SL^QBtL6yw4}+(xpUXO@geCxe0E9RI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..8800af2abce4713db92c08400b009c71e34cf706 GIT binary patch literal 760 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 N002ovPDHLkV1mbc!Il63 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ee06b56a1b884676e07d6855b0662f48e88f4b GIT binary patch literal 889 zcmV-<1BU#GP)Px&Gf6~2RCt{2+EGi}P!tF7f2DDSo3+9D(wAH9prGsRe2CW~q&{rjSFreK{EU8v zVF$v@bT4zJFdeQ;i1kV2?7>~v)x>Vv&Xk=Wl$NAP&po-hft~{}#u#IaF~%5U|DDWZ z2QW&uEeHT+W}e}xZR5PxL#NZZbBt4Q8|zwAU29rcSRk`a2tje*O$*x=RGu#b0CKq; z&U-!N^LbRO)jQ+9l>pau>GgpB5CjN< zATulpH~PQ0+uor1%JobTLfpK@68#7WA*iMl*|s3t7F1u+wAmS*=zn z2!af7J@~oO6|Cte*!%DS0B~_}k?Qp#GZ39M{RDHRE0`p7I-N{i>-Y=!VsX*zpxyQc zot>_e=XoThBq0RN&(Ej!%J(yip!w{19-W=8o0;(2nr2J^z}i=ws3H8kbGcGDRLZ#JkKK#sHPMp z-8Yj!N=Y@P2n6yP4RRcZlv43Cpr#ZpYYhMh!w|A00buAeG|f!xvLq269RUEe)~F36 zVG012wMKhq2LKR75oTv+@vYm1@B0%w0|4Ot-d^VN@)A)L0RY-NJ1`eIQL$JgbH7i@ zeV@eleVX(!Fvb{Tj4{R-V~jDz*yBiZVe}zl`vV4<@_5{KAp}(_6{>4J)=JX2s?$Rg zUO3{2NSi)|qtB2fiErI5n$6}Y!i+VN z1OV5ycmRJ_iyyG8HQu$`Fz1P)2qz~eneFZEQH41^HKh_Cmy9vSSUUXxpvZp?b#Qdw P00000NkvXXu0mjfvR$Cl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..7e85df5dfabe9dfcb939c447096aec34853641ad GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ex5FlArY-_ z&u`>BpdixnP&h92Ip58*M>ln5?`WOyO-F^>g@fb&^_Z{kDufswgqS`Fdm{De{p0gf u?{xin<`-ULdFpOvZQkAFbUC15msqwO70Ri9TQdd7VeoYIb6Mw<&;$V4Xg9_H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..fd26d4c782a4981c43504e3047e23d1a3f627e92 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}QJyZ2ArY-_ zFKiTSP!Mpr=&H-W;jvKKYlEBD25Dc<6%7{;@SQvGWPeS5xgQh5pEHroi{F2*T&q>7 zwIprd=7`g^YqTm)9nX3@O(l0)fXCV1b>Eq-?0A6&A7K7!Db)R|F3B0lVeoYIb6Mw< G&;$UB0yy#j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..36211bd0c0f1bfeb233360b43c2546fcebb612e0 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(Vi}jArY-_ zFD&G3Fc4{ZsBOUDdS%;f1194#mTipDmpP>bmT*o>H~63KcX#g-Plks1mf0Jpy|p?Q zsA=}~i(>sf={3inr-pX h4Y=G6YQQyeF$k?w>S6vodos{m22WQ%mvv4FO#s@sE=T|X literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..b10f47f74f8e30ea3f5100dd50b064e2483baabe GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}fu1goArY;~ z2@)6i%k7|s1S>=0a@~Z_>AzWlhBJ7&`njxgN@xNAXE!sP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/meta.json new file mode 100644 index 00000000000..9e2b955df79 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Made by KaiserMaus for SUNRISE ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} From 6f12743e6dfb3fcf3a9907c5d376c36df9ab89b3 Mon Sep 17 00:00:00 2001 From: GayBot Date: Tue, 31 Dec 2024 20:40:07 +0300 Subject: [PATCH 3/6] Automatic changelog update --- Resources/Changelog/ChangelogSunrise.yml | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index b105657d523..f0244e37dc9 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9206,3 +9206,28 @@ type: Fix id: 643 time: '2024-12-31T07:30:44.322953+00:00' +- author: KaiserMaus + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0442\u0430\ + \u0440\u0435\u0439\u043D\u044B\u0439 \u043B\u0430\u0437\u0435\u0440 \u0418\u041A\ + -30." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0442\u0430\ + \u0440\u0435\u0439\u043D\u044B\u0439 \u043B\u0430\u0437\u0435\u0440 LNT-620." + type: Add + - message: "\u0418\u041A-60 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\u0441\u043F\ + \u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u0431\u0430\u0442\u0430\u0440\u0435\ + \u0439\u043A\u0438." + type: Tweak + - message: "\u0426\u0435\u043D\u044B \u043D\u0430 \u044F\u0449\u0438\u043A Mp5,\ + \ M16\u04101 \u0438 \u0410\u041A\u041C\u0421 \u0431\u044B\u043B\u0438 \u0441\ + \u043D\u0438\u0436\u0435\u043D\u044B." + type: Tweak + - message: "\u0426\u0435\u043D\u044B \u043D\u0430 \u0418\u043C\u043F\u0443\u043B\ + \u044C\u0441\u043D\u043E\u0435 \u0432\u043E\u043E\u0440\u0443\u0436\u0435\u043D\ + \u0438\u0435 \u0432 \u0410\u043F\u043B\u0438\u043D\u043A\u0435 \u041E\u0411\u0420\ + \ \u0431\u044B\u043B\u0438 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u044B." + type: Tweak + id: 644 + time: '2024-12-31T17:43:40.0000000+00:00' + url: https://github.com/space-sunrise/space-station-14/pull/987 From 3bae34fc4e6072d966849133f57575e5be8dd702 Mon Sep 17 00:00:00 2001 From: GayBot Date: Tue, 31 Dec 2024 20:48:20 +0300 Subject: [PATCH 4/6] Automatic changelog update --- Resources/Changelog/ChangelogSunrise.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index f0244e37dc9..cde67ebce97 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9231,3 +9231,16 @@ id: 644 time: '2024-12-31T17:43:40.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/987 +- author: KaiserMaus + changes: + - message: "\u041E\u0411\u0420 \u0438 \u042D\u0441\u043A\u0430\u0434\u0440\u043E\ + \u043D \u0442\u0435\u043F\u0435\u0440\u044C \u0442\u043E\u043B\u044C\u043A\u043E\ + \ \u041B\u044E\u0434\u0438." + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0430\u0432\ + \u0430\u0440\u0438\u0439\u043D\u044B\u0435 \u043D\u0430\u0431\u043E\u0440\u044B\ + \ \u0434\u043B\u044F \u041E\u0411\u0420." + type: Fix + id: 645 + time: '2024-12-31T17:51:58.0000000+00:00' + url: https://github.com/space-sunrise/space-station-14/pull/989 From 6f03059174ebf98157d71685bb0fdf23e353c38d Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Tue, 31 Dec 2024 17:51:57 +0000 Subject: [PATCH 5/6] =?UTF-8?q?ERT:=20=D0=A2=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?= =?UTF-8?q?=20=D0=9B=D1=8E=D0=B4=D0=B8=20(#989)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Only Human * Update humanoid.yml --------- Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com> --- .../Entities/Mobs/Player/humanoid.yml | 64 ++++++++++++++ .../Jobs/CentComm/emergencyresponseteam.yml | 84 +++++++++---------- .../Entities/Clothing/Head/helmets.yml | 3 +- 3 files changed, 106 insertions(+), 45 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index de753a58cd6..91cc9bf6c6e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -42,6 +42,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: EventHumanoidMindShielded randomizeName: false components: @@ -88,6 +92,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: EventHumanoidMindShielded randomizeName: false components: @@ -129,6 +137,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: GhostRole @@ -161,6 +173,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeaderEVA components: - type: GhostRole @@ -203,6 +219,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: BibleUser @@ -244,6 +264,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTChaplain components: - type: GhostRole @@ -287,6 +311,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: GhostRole @@ -327,6 +355,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTJanitor components: - type: GhostRole @@ -369,6 +401,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: GhostRole @@ -409,6 +445,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTEngineer components: - type: GhostRole @@ -451,6 +491,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: GhostRole @@ -491,6 +535,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTSecurity components: - type: GhostRole @@ -523,6 +571,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTSecurityEVA components: - type: GhostRole @@ -565,6 +617,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTLeader components: - type: GhostRole @@ -605,6 +661,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: ERTMedical components: - type: GhostRole @@ -642,6 +702,10 @@ - Reptilian - Vulpkanin - Swine + - Tajaran + - Demon + - SlimePerson + - Dwarf parent: EventHumanoidMindShielded components: - type: Loadout diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index a84fd449d35..70ce0f8b382 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -20,7 +20,6 @@ jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeader shoes: ClothingShoesSwat # Sunrise-edit - mask: ClothingMaskGasERT # Sunrise-edit head: ClothingHeadEVAHelmetERTLeader # Sunrise-edit eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -29,14 +28,14 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: WeaponPistolN1984 - pocket2: MagazineMagnum + pocket2: HandheldCriminalRecordsMonitorUnpowered # Sunrise-edit storage: back: - WeaponEnergyGunPistolSecurity # Sunrise-edit - PortableSurveillanceCameraMonitorUnpowered # Sunrise-edit - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - MagazineMagnum - ERTDirectivesCircuitBoard # Sunrise-edit @@ -61,7 +60,7 @@ - WeaponEnergyGunPistolSecurity # Sunrise-edit - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - PortableSurveillanceCameraMonitorUnpowered # Sunrise-edit - MagazineMagnum @@ -89,7 +88,7 @@ - WeaponDisabler - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - MagazineMagnum - ERTDirectivesCircuitBoard # Sunrise-edit @@ -121,25 +120,23 @@ back: ClothingBackpackERTChaplain shoes: ClothingShoesSwat # Sunrise-edit head: ClothingHeadEVAHelmetERTChaplain # Sunrise-edit - eyes: ClothingEyesGlasses + eyes: ClothingEyesHudMedSec # Sunrise-edit neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorAmberChap # Sunrise-edit id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag - pocket1: Flare + pocket1: CrowbarRed # Sunrise-edit pocket2: DrinkWaterBottleFull storage: back: - BoxCandle - - BoxBodyBag - - DrinkWaterMelonJuiceJug + #-BoxBodyBag # Sunrise-edit - Lantern - Lantern - Bible - - CrowbarRed - - FoodBakedBunHotX + - MegaSprayBottle # Sunrise-edit - FoodBakedBunHotX - FoodBakedBunHotX - FoodBakedBunHotX @@ -152,25 +149,23 @@ back: ClothingBackpackERTChaplain shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT - eyes: ClothingEyesGlasses + eyes: ClothingEyesHudMedSec # Sunrise-edit neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTChaplain id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag - pocket1: Flare + pocket1: CrowbarRed # Sunrise-edit pocket2: DrinkWaterBottleFull storage: back: - BoxCandle - - BoxBodyBag - - DrinkWaterMelonJuiceJug + #-BoxBodyBag # Sunrise-edit - Lantern - Lantern - Bible - - CrowbarRed - - FoodBakedBunHotX + - MegaSprayBottle # Sunrise-edit - FoodBakedBunHotX - FoodBakedBunHotX - FoodBakedBunHotX @@ -197,8 +192,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineer - shoes: ClothingShoesSwat # Sunrise-edit - mask: ClothingMaskGasERT # Sunrise-edit + shoes: ClothingShoesBootsMagCombat # Sunrise-edit head: ClothingHeadEVAHelmetERTEngineer # Sunrise-edit eyes: ClothingEyesHudDiagnosticERT # Sunrise-edit gloves: ClothingHandsGlovesCombat @@ -211,12 +205,12 @@ storage: back: # - trayScanner # Sunrise-edit - - RCD - - RCDAmmo - - RCDAmmo - - CableMVStack - - CableHVStack - - CableApcStack + - RCDRecharging + #- RCDAmmo # Sunrise-edit + #- RCDAmmo # Sunrise-edit + #- CableMVStack # Sunrise-edit + #- CableHVStack # Sunrise-edit + #- CableApcStack # Sunrise-edit - SheetPlasteel - SheetSteel - SheetGlass @@ -239,12 +233,12 @@ storage: back: # - trayScanner # Sunrise-edit - - RCD - - RCDAmmo - - RCDAmmo - - CableMVStack - - CableHVStack - - CableApcStack + - RCDRecharging + #- RCDAmmo # Sunrise-edit + #- RCDAmmo # Sunrise-edit + #- CableMVStack # Sunrise-edit + #- CableHVStack # Sunrise-edit + #- CableApcStack # Sunrise-edit - SheetPlasteel - SheetSteel - SheetGlass @@ -271,7 +265,6 @@ jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurity shoes: ClothingShoesSwat # Sunrise-edit - mask: ClothingMaskGasERT # Sunrise-edit head: ClothingHeadEVAHelmetERTSecurity # Sunrise-edit eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat @@ -286,7 +279,7 @@ - WeaponEnergyGunPistolSecurity # Sunrise-edit - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - MagazineMagnum # Sunrise-edit @@ -310,7 +303,7 @@ - WeaponEnergyGunPistolSecurity # Sunrise-edit - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - MagazineMagnum # Sunrise-edit @@ -336,7 +329,7 @@ - WeaponDisabler - MedicatedSuture - RegenerativeMesh - - BoxZiptie + #- BoxZiptie # Sunrise-edit - CrowbarRed - MagazinePistol @@ -362,7 +355,6 @@ jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedical shoes: ClothingShoesSwat # Sunrise-edit - mask: ClothingMaskGasERT # Sunrise-edit head: ClothingHeadEVAHelmetERTMedic # Sunrise-edit eyes: ClothingEyesHudMedSec # Sunrise-edit gloves: ClothingHandsGlovesCombat # Sunrise-edit @@ -375,7 +367,7 @@ storage: back: - Hypospray - - MedkitAdvancedFilled + #- MedkitAdvancedFilled # Sunrise-edit - CrowbarRed - OmnizineChemistryBottle - EpinephrineChemistryBottle @@ -402,7 +394,7 @@ storage: back: - Hypospray - - MedkitAdvancedFilled + #- MedkitAdvancedFilled # Sunrise-edit - CrowbarRed - OmnizineChemistryBottle - EpinephrineChemistryBottle @@ -433,21 +425,22 @@ jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitor shoes: ClothingShoesGaloshes - mask: ClothingMaskGasERT # Sunrise-edit head: ClothingHeadEVAHelmetERTJanitor # Sunrise-edit + eyes: ClothingEyesGlassesSecurity # Sunrise-edit gloves: ClothingHandsGlovesCombat # Sunrise-edit outerClothing: ClothingOuterArmorAmberJan id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: WeaponEnergyGunPistolSecurity # Sunrise-edit + pocket2: CrowbarRed # Sunrise-edit storage: back: - LightReplacer - BoxLightMixed - - BoxLightMixed - - Soap - - CrowbarRed + #- BoxLightMixed # Sunrise-edit + #- Soap # Sunrise-edit + #- CrowbarRed # Sunrise-edit - AdvMopItem - type: startingGear @@ -457,17 +450,20 @@ back: ClothingBackpackERTJanitor shoes: ClothingShoesBootsMagCombat mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity # Sunrise-edit gloves: ClothingHandsGlovesCombat # Sunrise-edit outerClothing: ClothingOuterHardsuitERTJanitor id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: WeaponEnergyGunPistolSecurity # Sunrise-edit + pocket2: CrowbarRed # Sunrise-edit storage: back: - LightReplacer - BoxLightMixed - - BoxLightMixed - - Soap + #- BoxLightMixed # Sunrise-edit + #- Soap # Sunrise-edit + #- CrowbarRed # Sunrise-edit - CrowbarRed - AdvMopItem diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml index 70fd789d510..e833f7a69d7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml @@ -90,7 +90,8 @@ tags: - WhitelistChameleon - HelmetEVA - - type: IdentityBlocker + - type: FlashImmunity + - type: EyeProtection - type: HideLayerClothing slots: - Hair From c6f12f316fabfbe759fb69e2fe46034ffd691e7e Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Tue, 31 Dec 2024 20:53:08 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=B4=D0=B0=20=D0=B5=D0=B1=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=80=D0=BE=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Hands/Gloves/christmas_gloves.rsi/icon.png | Bin 0 -> 428 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/icon.png diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c9cc51367998ca1c27b70cb58413c625dc2360 GIT binary patch literal 428 zcmV;d0aN~oP)Px$W=TXrR9J=Wlrd_=Fc3w*LtLtHDM;l;q%uB)&fr`4EWVDrlxc#iMZH1If}3gF zImKoatt>fS2!wz>EXcE?`A@@0Kvq^()*q|*twPf@ZM<%p=5*bM08%E?G;Kl%mq$dW zA)X#F7eau43=_r~WKe1wl-dr90(kx@!7t*UGBjsdYe8D04fglOL_3mf6K`yn#l^%p zLQ3hri3mglDJ876x0u$^dLLC4g@^(SN^QQeFENe)04b#dc<(yACh`Gb76LCsQHb3P zu=yOcn?+iKw7#{P2mr7i7z4nyEHMj#c3BY4#T|feel5$pBB9>8ZZ{K0#wiE~5SpI_ z;p@i#^PZS7uag~!nfq(s1OV!~-pvpL(*cA(2M(Y&rbwC7S5Yn=6M2BWF~ypI2(=r+ znE8tDd+YDebXD=RDO-{=!+ WS@$QvGY^aa0000