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 00000000000..607666397dd Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/lnt620.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json index dee78c61809..694ba496fb9 100644 --- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json @@ -241,6 +241,9 @@ { "name": "stunbaton" }, + { + "name": "lnt620" + }, { "name": "box_flashbangs" }, diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/base.png new file mode 100644 index 00000000000..8e7a2e412b4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/base.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b16c44de38f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-BACKPACK.png differ 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 00000000000..8800af2abce Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/icon.png new file mode 100644 index 00000000000..7bfd8c5ad33 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/icon.png differ 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 00000000000..b9987bf0ec0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-left.png differ 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 00000000000..e00893fd3c2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/inhand-right.png differ 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 00000000000..54e4fdb7383 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..f74ec2edba2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-1.png differ 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 00000000000..d3e1909a221 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-2.png differ 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 00000000000..b523e63744b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..a0d8397bc9f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.rsi/meta.json new file mode 100644 index 00000000000..9e2b955df79 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/batterylaser_carbine.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 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/base.png new file mode 100644 index 00000000000..9b7eb2c1247 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/base.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b16c44de38f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-BACKPACK.png differ 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 00000000000..8800af2abce Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/icon.png new file mode 100644 index 00000000000..6b2927284f5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-left.png new file mode 100644 index 00000000000..65f2e0528aa Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-left.png differ 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 00000000000..b9ee06b56a1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/inhand-right.png differ 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 00000000000..7e85df5dfab Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-0.png differ 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 00000000000..fd26d4c782a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-1.png differ 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 00000000000..36211bd0c0f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..f32900b1fae Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-3.png differ 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 00000000000..b10f47f74f8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi/mag-unshaded-4.png differ 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 + } + ] +}