diff --git a/Resources/Audio/Announcements/RoundEnd/oney.ogg b/Resources/Audio/Announcements/RoundEnd/oney.ogg new file mode 100644 index 00000000000..ef8626ffdf9 Binary files /dev/null and b/Resources/Audio/Announcements/RoundEnd/oney.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg new file mode 100644 index 00000000000..7c6d85ad274 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg new file mode 100644 index 00000000000..686461b0f6c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg new file mode 100644 index 00000000000..5a1dd608f19 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg new file mode 100644 index 00000000000..8b81b4f8b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg new file mode 100644 index 00000000000..15733ecc251 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg new file mode 100644 index 00000000000..850881d5576 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg new file mode 100644 index 00000000000..bb42124906b Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg new file mode 100644 index 00000000000..9401627c68a Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg new file mode 100644 index 00000000000..f5ba46ae36c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg new file mode 100644 index 00000000000..b8969412b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg new file mode 100644 index 00000000000..5af96ae4541 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg new file mode 100644 index 00000000000..0379d94f484 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg new file mode 100644 index 00000000000..4cc40c8260f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg differ diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index c119670fc51..164d9d55539 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -154,7 +154,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSalvageEquipmentFilled - cost: 1000 + cost: 1300 category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 4404c194130..3d2dc4f6ab7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -274,7 +274,6 @@ - id: null orGroup: HypnoTempPlush #HypnoTemp Merch - End - # Floof - End # Syndicate loot - id: null prob: 0.95 @@ -288,30 +287,31 @@ - id: ClothingBackpackDuffelSyndicate prob: 0.005 orGroup: syndiemaintloot - #- id: CyberPen # DeltaV - Nuh uh - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: CigPackSyndicate - # prob: 0.005 - # orGroup: syndiemaintloot + - id: CyberPen # Floof - Yuh huh, it's funny + prob: 0.005 + orGroup: syndiemaintloot + - id: CigPackSyndicate + prob: 0.005 + orGroup: syndiemaintloot - id: ClothingBackpackDuffelSyndicatePyjamaBundle prob: 0.005 orGroup: syndiemaintloot - #- id: ClothingBeltMilitaryWebbing - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: ClothingShoesBootsCombatFilled - # prob: 0.005 - # orGroup: syndiemaintloot - #- id: ToolboxSyndicateFilled - # prob: 0.005 - # orGroup: syndiemaintloot + - id: ClothingBeltMilitaryWebbing + prob: 0.005 + orGroup: syndiemaintloot + - id: ClothingShoesBootsCombatFilled + prob: 0.005 + orGroup: syndiemaintloot + - id: ToolboxSyndicateFilled + prob: 0.005 + orGroup: syndiemaintloot - id: BalloonSyn prob: 0.005 orGroup: syndiemaintloot - #- id: WeaponSniperMosin - # prob: 0.0010 - # orGroup: syndiemaintloot + - id: WeaponSniperMosin + prob: 0.005 + orGroup: syndiemaintloot + # Floof - End - type: entity id: ClosetWallMaintenanceFilledRandom @@ -515,7 +515,7 @@ prob: 0.005 orGroup: syndiemaintloot - id: WeaponSniperMosin - prob: 0.0010 + prob: 0.005 orGroup: syndiemaintloot - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 5506caf6099..07e08e63478 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -30,6 +30,9 @@ ClothingHeadHatPumpkin: 2 ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 + ClothingHeadHatWitch1: 2 # Floof - Witch + ClothingHeadHatWitch: 2 # Floof - Witch + ClothingOuterSuitWitchRobes: 2 # Floof - Witch Gohei: 2 ClothingHeadHatRedRacoon: 2 ClothingOuterRedRacoon: 2 @@ -90,6 +93,7 @@ ClothingMaskNeckGaiterRed: 2 ClothingNeckBellCollar: 2 ClothingOuterUnathiRobe: 1 + ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak # Floofstation - Departmental Socks ect ClothingUniformMusicianThong: 2 ClothingUnderSocksMusician: 2 diff --git a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml index 61c2b286b7e..0856be21f18 100644 --- a/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/serviceGroups.yml @@ -102,6 +102,8 @@ id: LoadoutServiceBartenderBoxBeanbags - type: loadout id: LoadoutServiceBartenderBoxLightRifleRubber + - type: loadout + id: LoadoutServiceBartenderBoxMagnumRubber # Floofstation - type: characterItemGroup id: LoadoutBartenderWeapon @@ -110,6 +112,10 @@ id: LoadoutServiceBartenderShotgunDoubleBarreledRubber - type: loadout id: LoadoutServiceBartenderMosinRubber + - type: loadout + id: LoadoutServiceBartenderArgentiNonlethal # Floofstation + - type: loadout + id: LoadoutServiceBartenderRepeaterNonlethal # Floofstation - type: characterItemGroup id: LoadoutBartenderUniforms @@ -182,4 +188,4 @@ - type: loadout id: LoadoutServiceJumpsuitJanitorIdris - type: loadout - id: LoadoutServiceJumpsuitJanitorOrion \ No newline at end of file + id: LoadoutServiceJumpsuitJanitorOrion diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 226fa29164f..2071f7c4469 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -13,3 +13,10 @@ map: [ "empty-icon" ] # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi + - type: StaticPrice + price: 270 + - type: Construction #Frontier + graph: PKASawn #Frontier + node: start #Frontier + deconstructionTarget: null #Frontier + - type: Wieldable # Frontier diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..26d5a555f65 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodRedHood + name: Red Hood + description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun. + components: + - type: Sprite + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Clothing + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Hair diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..b19202b26d7 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakRedHood + name: Red Cloak + description: A cloak made for travel and comfort. Slightly smells of cherry pie? + components: + - type: Sprite + sprite: Floof/Clothing/Neck/Cloaks/redhood.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodRedHood + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml new file mode 100644 index 00000000000..4fefbeb07c0 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml @@ -0,0 +1,10 @@ +- type: entity # From Upstream + parent: ClothingOuterBase + id: ClothingOuterSuitWitchRobes + name: witch robes + description: Magic is all about the spell power, ZE! + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml index cc705a5b550..1525401c478 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml @@ -288,6 +288,21 @@ jobs: - Janitor +- type: loadout + id: LoadoutClothingNeckCloakJanitor + category: JobsServiceUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor + - !type:CharacterPlaytimeRequirement + tracker: JobJanitor + min: 36000 # 10 hours + items: + - ClothingNeckCloakJanitor + #TO BE ADDED - Botanist #TO BE ADDED - Reporter diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index 482270e6dbf..93b5a9ef2ad 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -9,6 +9,17 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck2 +- type: loadout + id: LoadoutItemsNeckRedHood + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCloakRedHood + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeck2 + # Generic collars - type: loadout id: LoadoutItemsNeckBlueCollar diff --git a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml index 9bb5ec1c9c6..d6e9f3e0a12 100644 --- a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml @@ -87,3 +87,13 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutOuter2 + +- type: loadout + id: LoadoutClothingOuterSuitWitchRobes + category: Outer + cost: 1 + items: + - ClothingOuterSuitWitchRobes + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuter2 diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml index c0f04ef151a..f2301e6aa0a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Loadouts/Jobs/service.yml @@ -291,6 +291,20 @@ items: - MagazineBoxLightRifleRubber +- type: loadout # Floof + id: LoadoutServiceBartenderBoxMagnumRubber + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderAmmo + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - MagazineBoxMagnumRubber + - type: loadout id: LoadoutServiceBartenderShotgunDoubleBarreledRubber category: JobsServiceBartender @@ -319,6 +333,34 @@ items: - WeaponSniperMosinRubber +- type: loadout # Floof + id: LoadoutServiceBartenderArgentiNonlethal + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - WeaponRevolverArgentiNonlethal + +- type: loadout # Floof + id: LoadoutServiceBartenderRepeaterNonlethal + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + items: + - WeaponSniperRepeaterNonlethal + - type: loadout id: LoadoutServiceJumpsuitBartenderNt category: JobsServiceBartender diff --git a/Resources/Prototypes/SoundCollections/announcements.yml b/Resources/Prototypes/SoundCollections/announcements.yml index b3336f9cf82..585797c68eb 100644 --- a/Resources/Prototypes/SoundCollections/announcements.yml +++ b/Resources/Prototypes/SoundCollections/announcements.yml @@ -26,3 +26,17 @@ - /Audio/Announcements/RoundEnd/susguyeatscrew.ogg - /Audio/Announcements/RoundEnd/this_drink.ogg - /Audio/Announcements/RoundEnd/truth_imagination.ogg + - /Audio/Announcements/RoundEnd/oney.ogg + # Floof added sounds + - /Audio/Floof/Announcements/RoundEnd/bangindonk.ogg + - /Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg + - /Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg + - /Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg + - /Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg + - /Audio/Floof/Announcements/RoundEnd/filledwith.ogg + - /Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg + - /Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg + - /Audio/Floof/Announcements/RoundEnd/lottawords.ogg + - /Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg + - /Audio/Floof/Announcements/RoundEnd/whatashame.ogg + - /Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..31e20f92c5a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakJanitor + name: janitor's cloak + description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof! + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi 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 new file mode 100644 index 00000000000..de5c79ba318 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -0,0 +1,148 @@ +- type: entity + id: BaseSpeedLoaderHeavyRifle + name: "speed loader (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoaderRifleHeavy + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeRifle + capacity: 8 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoaderRifleHeavy + name: "speed loader (.20 rifle)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyEmpty + name: "speed loader (.20 rifle any)" + parent: SpeedLoaderRifleHeavy + 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: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + +- type: entity + id: SpeedLoaderRifleHeavyIncendiary + name: "speed loader (.20 rifle incendiary)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleIncendiary + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyPractice + name: "speed loader (.20 rifle practice)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: practice-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: practice-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: practice + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyUranium + name: "speed loader (.20 rifle uranium)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: uranium-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: uranium-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: uranium + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyRubber + name: "speed loader (.20 rifle rubber)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: rubber-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 9 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml new file mode 100644 index 00000000000..73aa98d16c3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml @@ -0,0 +1,27 @@ +- type: entity + id: WeaponProtoKineticAcceleratorSawn + parent: WeaponProtoKineticAcceleratorBase + name: sawn-off proto-kinetic accelerator + description: boundaries and rules are ment to be broken otherwise there will be no progress, but this thing here is a good argumant against that statement. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + state: icon + - type: Item + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + size: Small + shape: + - 0,0,1,0 + - type: Gun + fireRate: 8 + selectedMode: FullAuto + availableModes: + - FullAuto + minAngle: 41 + maxAngle: 55 + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi + - type: Construction + graph: PKASawn + node: pkasawn + deconstructionTarget: null diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 00000000000..99b957f5e19 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1,36 @@ +- type: entity + name: Argenti + parent: BaseWeaponRevolver + id: WeaponRevolverArgenti + description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + components: + - type: Sprite + scale: 0.75 , 0.75 + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Gun + fireRate: 2.5 + resetOnHandSelected: false + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeRifle + - SpeedLoaderRifleHeavy + capacity: 8 + proto: CartridgeRifle + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] + - type: StaticPrice + price: 200 + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + capacity: 8 + proto: CartridgeRifleRubber + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml new file mode 100644 index 00000000000..e6005fd0cc7 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -0,0 +1,31 @@ +# Frontier +- type: entity + name: N2524 Pattern Repeater + parent: BaseWeaponSniper + id: WeaponSniperRepeater + description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Snipers/repeater.rsi + - type: StaticPrice + price: 500 + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + proto: CartridgeMagnum + +- type: entity + parent: WeaponSniperRepeater + id: WeaponSniperRepeaterNonlethal + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeMagnum + capacity: 7 + proto: CartridgeMagnumRubber diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml new file mode 100644 index 00000000000..9ed778d7844 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/pkasawn.yml @@ -0,0 +1,12 @@ +- type: constructionGraph + id: PKASawn + start: start + graph: + - node: start + edges: + - to: pkasawn + steps: + - tool: Sawing + doAfter: 2 + - node: pkasawn + entity: WeaponProtoKineticAcceleratorSawn diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml new file mode 100644 index 00000000000..91441684ab9 --- /dev/null +++ b/Resources/Prototypes/_NF/tags.yml @@ -0,0 +1,2 @@ +- type: Tag + id: SpeedLoaderRifleHeavy diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6a090ee541c Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png new file mode 100644 index 00000000000..3ac84622534 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json new file mode 100644 index 00000000000..bd53e417c59 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png new file mode 100644 index 00000000000..cdf97f81d12 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png new file mode 100644 index 00000000000..9e1aebb0395 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png new file mode 100644 index 00000000000..d4fd8db4bac Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png new file mode 100644 index 00000000000..1e1008748c2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json new file mode 100644 index 00000000000..de450048eb5 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b797c8dce44 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png new file mode 100644 index 00000000000..acdc1b394b2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png new file mode 100644 index 00000000000..a93d4a5af03 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png new file mode 100644 index 00000000000..0ee8f623627 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json new file mode 100644 index 00000000000..76513321794 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png new file mode 100644 index 00000000000..b2f820071c8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png new file mode 100644 index 00000000000..ab239662ab5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png new file mode 100644 index 00000000000..721476f5923 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png new file mode 100644 index 00000000000..cae5a2d0e07 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json new file mode 100644 index 00000000000..5ef8985ec58 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, edited by dvir001 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "plunger" + }, + { + "name": "plunger-equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png new file mode 100644 index 00000000000..978c7a77800 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png new file mode 100644 index 00000000000..53f0183cf19 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png new file mode 100644 index 00000000000..2c6f3fb0726 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png new file mode 100644 index 00000000000..9fc7ae245b2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png new file mode 100644 index 00000000000..223c9e3b4fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png new file mode 100644 index 00000000000..e8efed267b9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png new file mode 100644 index 00000000000..690e4e402c5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png new file mode 100644 index 00000000000..cc5db9400da Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png new file mode 100644 index 00000000000..8755dd94dec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png new file mode 100644 index 00000000000..eada2162213 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png new file mode 100644 index 00000000000..8af13d1cf16 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png new file mode 100644 index 00000000000..c6df5f222b4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json new file mode 100644 index 00000000000..e6cc7f46fd9 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json @@ -0,0 +1,149 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on the frontier discord", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + }, + { + "name": "base-7" + }, + { + "name": "base-8" + }, + { + "name": "practice-1" + }, + { + "name": "practice-2" + }, + { + "name": "practice-3" + }, + { + "name": "practice-4" + }, + { + "name": "practice-5" + }, + { + "name": "practice-6" + }, + { + "name": "practice-7" + }, + { + "name": "practice-8" + }, + { + "name": "practice-icon" + }, + { + "name": "rubber-1" + }, + { + "name": "rubber-2" + }, + { + "name": "rubber-3" + }, + { + "name": "rubber-4" + }, + { + "name": "rubber-5" + }, + { + "name": "rubber-6" + }, + { + "name": "rubber-7" + }, + { + "name": "rubber-8" + }, + { + "name": "rubber-icon" + }, + { + "name": "uranium-1" + }, + { + "name": "uranium-2" + }, + { + "name": "uranium-3" + }, + { + "name": "uranium-4" + }, + { + "name": "uranium-5" + }, + { + "name": "uranium-6" + }, + { + "name": "uranium-7" + }, + { + "name": "uranium-8" + }, + { + "name": "uranium-icon" + }, + { + "name": "piercing-1" + }, + { + "name": "piercing-2" + }, + { + "name": "piercing-3" + }, + { + "name": "piercing-4" + }, + { + "name": "piercing-5" + }, + { + "name": "piercing-6" + }, + { + "name": "piercing-7" + }, + { + "name": "piercing-8" + }, + { + "name": "piercing-icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png new file mode 100644 index 00000000000..4930f3f9989 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png new file mode 100644 index 00000000000..28cbeba80bf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png new file mode 100644 index 00000000000..63b7a84f900 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png new file mode 100644 index 00000000000..749eba847ae Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png new file mode 100644 index 00000000000..f7608dbedba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png new file mode 100644 index 00000000000..3079f5324e6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png new file mode 100644 index 00000000000..0a1ec7887ed Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png new file mode 100644 index 00000000000..7c46da59ce5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png new file mode 100644 index 00000000000..c84f3f68fef Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png new file mode 100644 index 00000000000..e5f08f1d51f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png new file mode 100644 index 00000000000..ababaa84671 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png new file mode 100644 index 00000000000..411fc78a3fd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png new file mode 100644 index 00000000000..515b63889f5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png new file mode 100644 index 00000000000..cc7011a1642 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png new file mode 100644 index 00000000000..2e7e7fbcdab Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png new file mode 100644 index 00000000000..f8e250bd15e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png new file mode 100644 index 00000000000..d7dfe0371fe Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png new file mode 100644 index 00000000000..670965cafd1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png new file mode 100644 index 00000000000..5dca9d7803d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png new file mode 100644 index 00000000000..f615854e5ce Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png new file mode 100644 index 00000000000..44dacb9f0b8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png new file mode 100644 index 00000000000..7216d9f79fa Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png new file mode 100644 index 00000000000..7a6d1b044dc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png new file mode 100644 index 00000000000..65a9e355e02 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png new file mode 100644 index 00000000000..18a0b63c5d5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png new file mode 100644 index 00000000000..a5517503ebc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png new file mode 100644 index 00000000000..d77bd3998ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png new file mode 100644 index 00000000000..084eb43a8c8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png new file mode 100644 index 00000000000..1c6069bcbb4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png new file mode 100644 index 00000000000..a47505934cc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png new file mode 100644 index 00000000000..b5b31a8e2ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png new file mode 100644 index 00000000000..4cc13396828 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png new file mode 100644 index 00000000000..8e6e5ba62ef Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png new file mode 100644 index 00000000000..5378e8179fd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png new file mode 100644 index 00000000000..13668787201 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png new file mode 100644 index 00000000000..c8511271a9a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png new file mode 100644 index 00000000000..28077085547 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png new file mode 100644 index 00000000000..acd074e877c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png new file mode 100644 index 00000000000..767ed5b8e49 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png new file mode 100644 index 00000000000..e54e8fa2cc8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json new file mode 100644 index 00000000000..98181d3ead3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, and belt equip sprites by RiceMar1244 | edited for sawn-off version by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png new file mode 100644 index 00000000000..5da259a4230 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d5c2e5102fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png new file mode 100644 index 00000000000..5da259a4230 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png new file mode 100644 index 00000000000..57fb0c7c594 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png new file mode 100644 index 00000000000..97f36840ffd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json new file mode 100644 index 00000000000..b261898e2f1 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on frontier discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png new file mode 100644 index 00000000000..421fb601521 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png new file mode 100644 index 00000000000..5194385cf00 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ff8892bdaf3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ff8892bdaf3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png new file mode 100644 index 00000000000..417daab4009 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png new file mode 100644 index 00000000000..1aec54fe893 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json new file mode 100644 index 00000000000..f0146e82a56 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..f41af6b0c46 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..fcae7fa8f04 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png differ