diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 9b4aef4996c..4f8e10fc938 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -3,8 +3,10 @@ startingInventory: SurvivalKnife: 10 WeaponLaserPistolNF: 10 # Frontier - WeaponSniperMosin: 10 - WeaponSniperRepeater: 10 +# WeaponSniperMosin: 10 + WeaponRifleGestio: 10 +# WeaponSniperRepeater: 10 + WeaponRifleNovaliteC1: 5 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 MagazineBoxLightRifleRubber: 15 @@ -13,11 +15,11 @@ BoxShotgunSlug: 10 BoxLethalshot: 10 BoxBeanbag: 10 - BoxShotgunPractice: 10 MagazineBoxRifle: 10 MagazineBoxRifleRubber: 15 MagazineBoxMagnum: 10 - SpeedLoaderRifleHeavy: 10 - SpeedLoaderRifleHeavyRubber: 10 + SpeedLoaderRifleHeavyEmpty: 10 + MagazineNovaliteC1Empty: 10 + MagazineRifleLowCapacityEmpty: 10 emaggedInventory: WeaponPistolViper: 1 diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 1ebbe75cc60..99815bb9764 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -323,7 +323,7 @@ amount: 1 prob: 0.1 - entries: - - id: MobMercenarySoldierMosin + - id: MobMercenarySoldierNovalite amount: 2 maxAmount: 4 prob: 0.05 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml index d5638fd38e3..397be0d55dd 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml @@ -97,7 +97,7 @@ - type: entity parent: MercenaryDuffelGiftBox - id: ClothingBackpackDuffelMecranaryTier1Mosin + id: ClothingBackpackDuffelMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse @@ -110,7 +110,7 @@ - id: SpaceCash500 prob: 0.45 # Weapons - - id: WeaponSniperMosin + - id: WeaponRifleNovaliteC1 prob: 0.9 # Armor - id: ClothingOuterVestWebMercenary @@ -137,14 +137,20 @@ - type: entity parent: MercenaryWebbingBox - id: ClothingBeltWebbingMecranaryTier1Mosin + id: ClothingBeltWebbingMecranaryTier1Novalite noSpawn: true components: - type: SpawnItemsOnUse items: - - id: MagazineBoxLightRifle + - id: MagazineBoxRifle + prob: 0.9 + - id: MagazineNovaliteC1Empty + prob: 0.9 + - id: MagazineNovaliteC1Empty prob: 0.9 - - id: MagazineBoxLightRifleBig + - id: MagazineNovaliteC1 + prob: 0.2 + - id: MagazineBoxRifleBig prob: 0.2 sound: path: /Audio/Items/jumpsuit_equip.ogg diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index ff84e6b8e0b..6d61c72710c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -237,6 +237,19 @@ - id: MagazineRifleLowCapacity amount: 3 +- type: entity + parent: WeaponCaseLong + id: WeaponCaseLongWeaponRifleNovaliteC1Expedition + suffix: Dungeon, NovaliteC1 + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRifleNovaliteC1Expedition + amount: 1 + - id: MagazineNovaliteC1 + amount: 2 + - type: entity parent: WeaponCaseLong id: WeaponCaseLongLecterExpedition diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 9086abe8c7d..ea66484677a 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,7 +2,7 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - Kardashev-MosinNonlethal: 10 +# Kardashev-MosinNonlethal: 10 WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index c793cb2d795..5ddff0e8283 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -229,7 +229,7 @@ name: uplink-security-emitter-name description: uplink-security-emitter-desc productEntity: WeaponEmpEmitter - icon: { sprite: _NF/Objects/Weapons/EMP-Gun.rsi, state: icon } + icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml index 2e61b05527b..e3e1f80bb7e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml @@ -162,6 +162,21 @@ - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi state: wielded-inhand-right +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorMercNovalite + name: combat gloves + suffix: novalite + noSpawn: true + components: + - type: Clothing + clothingVisuals: + gloves: + - sprite: Clothing/Hands/Gloves/mercbattle.rsi + state: equipped-HAND + - sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + state: wielded-inhand-right + - type: entity parent: ClothingHandsGlovesColorBlackSMG id: ClothingHandsGlovesColorMercHatchet diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index 8975ad6b497..78aec57f96a 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -179,6 +179,7 @@ - WeaponCaseShortDeckardExpedition - WeaponCaseShortPython - WeaponCaseLongGestioExpedition + - WeaponCaseLongWeaponRifleNovaliteC1Expedition - WeaponCaseLongKammererExpedition - WeaponCaseLongEnergyGunExpedition - WeaponCaseLongRepeaterExpedition diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml index d6c309d5a28..44137932c49 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml @@ -29,7 +29,7 @@ prototypes: - MobMercenarySoldierKnife - MobMercenarySoldierPistol - - MobMercenarySoldierMosin + - MobMercenarySoldierNovalite chance: 1 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml index 4d975cc9b87..57e51292435 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml @@ -151,7 +151,7 @@ - type: entity name: mercenary soldier parent: MobMercenaryBase - id: MobMercenarySoldierMosin + id: MobMercenarySoldierNovalite # No mosin: novalite rifle now description: Low-ranking soldiers armed with a variety of surplus weapons. noSpawn: true components: @@ -179,18 +179,18 @@ color: "#a9b6bd" shader: unshaded - type: BasicEntityAmmoProvider - proto: CartridgeLightRifle + proto: CartridgeRifle capacity: 10 count: 10 - type: Gun showExamineText: false - fireRate: 0.65 + fireRate: 0.85 minAngle: 1 maxAngle: 10 selectedMode: SemiAuto availableModes: - SemiAuto - soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg ## Tier 2 - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a61a9c66969..0bea7905ab4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -24,7 +24,7 @@ proto: CartridgeLightRifle capacity: 10 - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi - type: entity id: 10roundmagazineempty @@ -49,19 +49,19 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -# type: entity to be added back when Rubber rounds are added. - # id: 10roundmagazineRubber - #name: "10 round magazine(.30 rifle rubber)" - #parent: 10roundmagazine - #components: - # type: BallisticAmmoProvider - # proto: CartridgeLightRifleRubber - #type: Sprite - #layers: - # state: rubber - #map: ["enum.GunVisualLayers.Base"] - #state: mag-1 - #map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: 10roundmagazineRubber + name: "10 round magazine(.30 rifle rubber)" + parent: 10roundmagazine + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: entity id: 10roundmagazinePractice @@ -85,4 +85,4 @@ - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary - type: Sprite - sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml new file mode 100644 index 00000000000..c9866174540 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -0,0 +1,48 @@ +# Empty mags +- type: entity + parent: BaseMagazineRifle + id: MagazineNovaliteC1Empty + name: "clip (.20 rifle any)" + suffix: empty + components: + - type: Tag + tags: + - MagazineNovaliteC1 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 15 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 16 + zeroVisible: false + - type: Appearance + +- type: entity + parent: MagazineNovaliteC1Empty + id: MagazineNovaliteC1 + name: "clip (.20 rifle)" + suffix: full + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml similarity index 68% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml index 36ad148c41b..9e93b0dd01f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_low.yml @@ -1,6 +1,23 @@ +- type: entity + id: MagazineRifleLowCapacityEmpty + name: "low cap magazine (.20 rifle any)" + suffix: empty + parent: MagazineRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: entity id: MagazineRifleLowCapacity - name: "magazine Low-Cap (.20 rifle)" + name: "low cap magazine (.20 rifle)" parent: BaseMagazineRifle components: - type: BallisticAmmoProvider @@ -9,7 +26,7 @@ - type: Item size: Tiny - type: Sprite - sprite: _NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi layers: - state: red map: ["enum.GunVisualLayers.Base"] @@ -18,7 +35,7 @@ - type: entity id: MagazineRifleLowCapacityPractice - name: "magazine Low-Cap (.20 rifle practice)" + name: "low cap magazine (.20 rifle practice)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -35,7 +52,7 @@ - type: entity id: MagazineRifleLowCapacityRubber - name: "magazine Low-Cap (.20 rifle rubber)" + name: "low cap magazine (.20 rifle rubber)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider @@ -52,7 +69,7 @@ - type: entity id: MagazineRifleLowCapacityUranium - name: "magazine Low-Cap (.20 rifle uranium)" + name: "low cap magazine (.20 rifle uranium)" parent: MagazineRifleLowCapacity components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml index 2fea05d787b..de5c79ba318 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -49,6 +49,9 @@ components: - type: BallisticAmmoProvider proto: null + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: base - type: Sprite sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 87f0a10568d..b1a113efda0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -5,7 +5,7 @@ description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells, has a slow self charging nuclear powered battery. components: - type: Sprite - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -13,7 +13,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: _NF/Objects/Weapons/EMP-Gun.rsi + sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi - type: Gun fireRate: 1 selectedMode: SemiAuto diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml index f9f22136860..6e29bf58b56 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml @@ -5,14 +5,14 @@ description: An old prototype burst-fire NanoTrasen marksman rifle. Manufactured by Silver Industries. It hasn't ever left the trials. Given it's antiquity it is considered a civilian grade weapon. Uses .20 rifle ammo. components: - type: Sprite - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi - type: Gun fireRate: 3.75 projectileSpeed: 30 @@ -25,6 +25,8 @@ - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle3.ogg + params: + volume: -5 - type: Wieldable - type: GunWieldBonus minAngle: -2 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml new file mode 100644 index 00000000000..b3984c33eeb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/novalitec1.yml @@ -0,0 +1,51 @@ +- type: entity + parent: BaseWeaponRifle + id: WeaponRifleNovaliteC1 + name: Novalite C1 + description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + - type: Gun + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + params: + variation: 0.125 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineNovaliteC1 + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml index 100f6eeaa80..b0641a0a6a9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml @@ -51,6 +51,11 @@ noSpawn: true id: WeaponRifleGestioExpedition +- type: entity + parent: [ WeaponRifleNovaliteC1, UnregisteredFirearmBase ] + noSpawn: true + id: WeaponRifleNovaliteC1Expedition + # SMGs - type: entity parent: [ WeaponSubMachineGunWt550, UnregisteredFirearmBase ] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml index 01db2de3bf2..420aad7f8a1 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/mercenaries.yml @@ -18,9 +18,9 @@ - type: startingGear id: MobHumanoidMercenaryGearRangedAltT1 equipment: - gloves: ClothingHandsGlovesColorMercMosin - back: ClothingBackpackDuffelMecranaryTier1Mosin - belt: ClothingBeltWebbingMecranaryTier1Mosin + gloves: ClothingHandsGlovesColorMercNovalite + back: ClothingBackpackDuffelMecranaryTier1Novalite + belt: ClothingBeltWebbingMecranaryTier1Novalite shoes: ClothingShoesBootsMercenary # Tier 2 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 67ad837d3df..82b7ed2eff4 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -75,6 +75,12 @@ - type: Tag id: HoverbikeKeys + +- type: Tag + id: WeaponRifleNovaliteC1 + +- type: Tag + id: MagazineNovaliteC1 - type: Tag id: TrackingDart diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml index 73ab433d20e..24b1fca2e8c 100644 --- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml +++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/mercenaries.xml @@ -37,13 +37,13 @@ [bold][color=#a4885c]________________________________________________________________________[/color] - + - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 130 (death) - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (2.5 m/s) - - [bold][color=#a4885c]Damage (type):[/color][/bold] 19 [color=yellow]Piercing[/color] (.30 round) + - [bold][color=#a4885c]Damage (type):[/color][/bold] 17 [color=yellow]Piercing[/color] (.20 round) - [bold][color=#a4885c]Damage resistances:[/color][/bold] [color=red]Blunt[/color], [color=red]Slash[/color] and [color=yellow]Piercing[/color] 25%; [color=orange]Heat[/color] 20%; [color=orange]Caustic[/color] 10% - - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Kardashev-Mosin) + - [bold][color=#a4885c]Special abilities:[/color][/bold] Shooter (Novalite C1) [bold][color=#a4885c]________________________________________________________________________[/color] diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png new file mode 100644 index 00000000000..956577e3a1a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png new file mode 100644 index 00000000000..8182b21f64d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png new file mode 100644 index 00000000000..e5098ddf47c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png new file mode 100644 index 00000000000..aa689c92906 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png new file mode 100644 index 00000000000..a2c008fa1cf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png new file mode 100644 index 00000000000..d3a7d26fee3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png new file mode 100644 index 00000000000..06c8afc777e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png new file mode 100644 index 00000000000..9302a392790 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png new file mode 100644 index 00000000000..7081547a514 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png new file mode 100644 index 00000000000..458e8cd9729 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png new file mode 100644 index 00000000000..f9767afa04c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png new file mode 100644 index 00000000000..f4f0b1df6b5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png new file mode 100644 index 00000000000..dc7c1302499 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png new file mode 100644 index 00000000000..bf3cfe20a87 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png new file mode 100644 index 00000000000..db949f30b94 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png new file mode 100644 index 00000000000..b9af911cacd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json new file mode 100644 index 00000000000..62b8aa22373 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "mag-9" + }, + { + "name": "mag-10" + }, + { + "name": "mag-11" + }, + { + "name": "mag-12" + }, + { + "name": "mag-13" + }, + { + "name": "mag-14" + }, + { + "name": "mag-15" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/mag-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/practice.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/red.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/rubber.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi/uranium.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-1.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-2.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-2.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-3.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-3.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/mag-unshaded-4.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/mag-unshaded-4.png diff --git a/Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/EMP-Gun.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/emp.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/base.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/mag-0.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/wielded-inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png new file mode 100644 index 00000000000..947d0a89b48 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png new file mode 100644 index 00000000000..9a8d405132b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..aff01673b18 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png new file mode 100644 index 00000000000..0e1eb2312bb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png new file mode 100644 index 00000000000..9054ef072fc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png new file mode 100644 index 00000000000..e0bb34e6c76 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png new file mode 100644 index 00000000000..8aeb1b4d9d7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json new file mode 100644 index 00000000000..70e934ec946 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111 | wielded-inhand-right and wielded-inhand-left sprites made by Stagnation (discord) and those two sprites specifically are under CC-BY-NC-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..1a20b9c047c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..0dd4640d405 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png differ