diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg new file mode 100644 index 00000000000..c992143f519 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg new file mode 100644 index 00000000000..39ceccdf4a1 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg new file mode 100644 index 00000000000..e86073d1136 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg differ diff --git a/Resources/Audio/DeltaV/license.txt b/Resources/Audio/DeltaV/license.txt index 68d3dfa64cd..ff29d0e1be7 100644 --- a/Resources/Audio/DeltaV/license.txt +++ b/Resources/Audio/DeltaV/license.txt @@ -1 +1,4 @@ typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sound/ which is licensed under the CC BY 4.0 License. This modified file follows the same license. +axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license. +jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license. +universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl index 57cd2b0120d..1c7990596f4 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl @@ -1,2 +1,20 @@ reagent-name-kvass = kvass reagent-desc-kvass = A cool refreshing drink with a taste of socialism. + +reagent-name-gunmetal = gunmetal +reagent-desc-gunmetal = A controversial drink first mixed by Solus Cream, renowned as the first bartender to serve welding fuel in a cocktail - without losing their liquor license. + +reagent-name-lemondrop = lemon drop +reagent-desc-lemondrop = A simple, tangy, and tasty drink consisting of lemon, vodka, and simple syrup. Refreshing! + +reagent-name-greengrass = green grass +reagent-desc-greengrass = Green grass, or grüne wiese, is a peculiar green cocktail hailing from the now dissolved GDR. Popular amongst the disillusioned and disingenuous alike. + +reagent-name-daiquiri = modern daiquiri +reagent-desc-daiquiri = A sweet mix of deadrum and lime, a favourite of writers and politicians. + +reagent-name-arsonistsbrew = arsonist's brew +reagent-desc-arsonistsbrew = Take a sip and laugh, while you watch your world burn. + +reagent-name-dulleavene = dulleavene +reagent-desc-dulleavene = Allegedly it's a cocktail. The warning cone motif seems apt. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 091501b7fda..b20f101f4c1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,7 +4,7 @@ sprite: Clothing/OuterClothing/Armor/security.rsi state: icon product: CrateSecurityArmor - cost: 700 + cost: 1000 # DeltaV - raise price for buffed armour category: Security group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index c895e00d49c..6df9d1d799e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -4,7 +4,7 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorBulletproof + - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBulletproof replaced in favour of plate carrier amount: 3 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 8c8714496a8..bf75a7e9f5b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -109,6 +109,8 @@ - id: IDComputerCircuitboard - id: WeaponDisabler - id: ClothingOuterWinterHoP + - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite + - id: ClothingOuterCoatHoPFormal # DeltaV - formal jacket - id: CigarGoldCase prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 3c1d812b333..675714af2df 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -62,11 +62,25 @@ prob: 0.8 - id: ClothingUniformJumpsuitSecGrey prob: 0.3 + - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms + prob: 0.3 + - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms + prob: 0.3 + - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms + prob: 0.3 + - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms + prob: 0.3 + - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms + prob: 0.3 - id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear prob: 0.4 - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - id: ClothingOuterArmorDuraVest + - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 + prob: 0.75 + - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit + prob: 0.25 - id: ClothingBeltSecurityFilled - id: Flash prob: 0.5 diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml index 7eccbcae9d0..4d2214da8c0 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml @@ -4,7 +4,7 @@ sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi state: base product: CrateArmoryGrand - cost: 4000 + cost: 5500 category: Armory group: market @@ -14,7 +14,7 @@ sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi state: icon product: CrateArmoryUniversal - cost: 3500 + cost: 6500 category: Armory group: market @@ -24,6 +24,6 @@ sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi state: icon product: CrateArmoryAdjutant - cost: 9000 + cost: 10000 category: Armory group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 80b2dbede78..bccb5e51e3d 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -13,9 +13,9 @@ amount: 1 - id: WeaponPistolViperWood amount: 1 -# - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails) +# - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails) || it does WHAT now??? # amount: 1 -# - id: BaseBallBat # THIS BAT IS TOO DAMN BIG! +# - id: BaseBallBat # THIS BAT IS TOO DAMN BIG! || well shucks, guess I'll cry # amount: 1 - type: entity diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml index 4a25602537e..a66a6b268a1 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml @@ -17,7 +17,7 @@ contents: - id: WeaponPistolUniversal amount: 2 - - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalMagnum amount: 4 - type: entity diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belt.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belt.yml new file mode 100644 index 00000000000..a18696b22d4 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belt.yml @@ -0,0 +1,9 @@ +- type: entity + id: ClothingBeltKatanaSheathFilled + parent: ClothingBeltKatanaSheath + suffix: Filled + components: + - type: StorageFill + contents: + - id: Wakizashi + - id: Katana diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml index 27940b89eae..9c31dfa4df3 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml @@ -1,26 +1,26 @@ -#- type: entity -# parent: GunSafe -# id: GunSafePistolUniversal -# name: mk32 safe -# components: -# - type: StorageFill -# contents: -# - id: WeaponPistolUniversal -# amount: 2 -# - id: MagazineUniversalCaselessRifle -# amount: 4 +- type: entity + parent: GunSafe + id: GunSafePistolUniversal + name: mk32 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolUniversal + amount: 2 + - id: MagazineUniversalMagnum + amount: 4 -#- type: entity -# parent: GunSafe -# id: GunSafeSniperGrand -# name: mark 1 rifle safe -# components: -# - type: StorageFill -# contents: -# - id: WeaponSniperGrand -# amount: 2 -# - id: SpeedLoaderLightRifle -# amount: 4 +- type: entity + parent: GunSafe + id: GunSafeSniperGrand + name: mark 1 rifle safe + components: + - type: StorageFill + contents: + - id: WeaponSniperGrand + amount: 2 + - id: SpeedLoaderLightRifle + amount: 4 - type: entity parent: GunSafe diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index d177e48f9c6..2d39ab66816 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -135,3 +135,14 @@ sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi - type: Clothing sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatDirCap + name: director's cap + description: A green cap with a director's rank emblem, belonging to a high-ranking member of Central Command. Whoever it is, they mean business. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/dircap.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/dircap.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml index d40a6fe1ece..ed4a0078982 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml @@ -7,4 +7,15 @@ - type: Sprite sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi + sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakBoat + name: NanoTrasen boat cloak + description: A regal blue durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi + - type: Clothing + sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index 93b17ad4c37..e0a38b169f0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -110,3 +110,16 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatHoPFormal + name: head of personnel's formal jacket + description: A showy and over-the-top jacket with gold buttons and red trim. More tacky than classy. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi + - type: TemperatureProtection + coefficient: 0.1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml index 5be3b47d8c3..2b881be52d6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml @@ -37,3 +37,21 @@ sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi - type: Clothing sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterStasecSweater + name: station security sweater + description: A thick synthetic sweater with reinforced shoulders and elbows, enough to warm even the harshest security officer's cold heart. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi + - type: Armor # Keep this the same as the sec winter coat + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.75 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 788f7b357c1..b1fd60ac360 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtHoPMess name: head of personnel's mess kit description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this. @@ -8,3 +8,64 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi + +# Security alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSecBlue + name: blue security jumpskirt + description: A cool blue shirt over charcoal skirt, for the calm and collected security officer. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi + +# Warden alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWardenBlue + name: blue warden's jumpskirt + description: A cool blue shirt with ice-white markings and warden's epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWardenGrey + name: grey warden's jumpskirt + description: Charcoal skirt, a grey shirt, and white warden's markings and epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi + +# HoS alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHoSBlue + name: head of security's blue jumpskirt + description: A blue Station Security shirt with charcoal skirt. Features gold emblems and commander's epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHoSGrey + name: head of security's grey jumpskirt + description: A grey Station Security shirt with charcoal skirt. Stands out with red highlights, gold emblems, and commander's epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index eed1db81aaa..cb67165c068 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -123,7 +123,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSecFormal name: security formal suit - description: A suit for special occasions. + description: A ceremonial piece of Station Security kit, for special occasions of any kind. components: - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi @@ -184,3 +184,27 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi + +# Warden alt uniforms + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWardenBlue + name: blue warden's jumpsuit + description: A cool blue shirt with ice-white markings and warden's epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWardenGrey + name: grey warden's jumpsuit + description: Charcoal pants, a grey shirt, and white warden's markings and epaulettes. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 41f76455c1f..23824c6812f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -7,6 +7,47 @@ components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - MagazinePistolHighCapacity + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: Pollock + parent: BaseWeaponPistol + id: WeaponPistolPollock + description: A compact and mass-produced combat pistol. Uses .35 auto ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Gun + fireRate: 5 + availableModes: + - SemiAuto - type: ItemSlots slots: gun_magazine: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 46786c8d084..500b0def088 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -1,8 +1,8 @@ - type: entity - name: vulcan + name: Vulcan parent: BaseWeaponRifle id: WeaponRifleVulcan - description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs." + description: One of the first firearms modified for space usage, this rifle was purpose-designed to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo. components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi @@ -46,4 +46,130 @@ - type: Appearance - type: Clothing sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi - \ No newline at end of file + +- type: entity + name: CAWS-25 Jackdaw + parent: BaseWeaponRifle + id: WeaponRifleJackdaw + description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. + suffix: Deathsquad + components: + - type: Item + size: 30 + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 2 + maxAngle: 6 + angleIncrease: 2 + angleDecay: 8 + fireRate: 8 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + +- type: entity + name: Tenebra + parent: BaseWeaponRifle + id: WeaponRifleTenebra + description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 3 + maxAngle: 12 + angleIncrease: 3 + angleDecay: 12 + fireRate: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + 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 + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + +- type: entity + name: M-90 + id: WeaponRifleM90 + parent: WeaponRifleM90GrenadeLauncher + description: An older bullpup carbine model. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml new file mode 100644 index 00000000000..9a196f26843 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml @@ -0,0 +1,96 @@ +# Jumpsuits - Security + +- type: latheRecipe + id: ClothingUniformJumpsuitSecBlue + result: ClothingUniformJumpsuitSecBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecGrey + result: ClothingUniformJumpsuitSecGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitHoSBlue + result: ClothingUniformJumpsuitHoSBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitHoSGrey + result: ClothingUniformJumpsuitHoSGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitWardenBlue + result: ClothingUniformJumpsuitWardenBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitWardenGrey + result: ClothingUniformJumpsuitWardenGrey + completetime: 4 + materials: + Cloth: 300 + +# Jumpskirts - Security + +- type: latheRecipe + id: ClothingUniformJumpskirtSecBlue + result: ClothingUniformJumpskirtSecBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtSecGrey + result: ClothingUniformJumpskirtSecGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtHoSBlue + result: ClothingUniformJumpskirtHoSBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtHoSGrey + result: ClothingUniformJumpskirtHoSGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtWardenBlue + result: ClothingUniformJumpskirtWardenBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtWardenGrey + result: ClothingUniformJumpskirtWardenGrey + completetime: 4 + materials: + Cloth: 300 + +# Security Sweater + +- type: latheRecipe + id: ClothingOuterStasecSweater + result: ClothingOuterStasecSweater + completetime: 4 + materials: + Cloth: 500 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index a937a28e766..0beb2e93a2f 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -52,3 +52,19 @@ materials: Steel: 350 Plastic: 300 + +- type: latheRecipe + id: ClothingOuterArmorPlateCarrier + result: ClothingOuterArmorPlateCarrier + completetime: 10 + materials: + Steel: 1500 + Plastic: 1500 + +- type: latheRecipe + id: ClothingOuterArmorDuraVest + result: ClothingOuterArmorDuraVest + completetime: 10 + materials: + Steel: 500 + Plastic: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index e14590b668c..672fe4e6275 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -48,9 +48,9 @@ description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. components: - type: Sprite - sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi # DeltaV - resprite - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 43ea9eaba66..abe474ff922 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -81,12 +81,12 @@ sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterCaptain - - type: Armor # DeltaV - adds resists to coat, same as security winter coat. Still better than nothing, but nowhere as good as a carapace + - type: Armor # DeltaV - adds resists to coat, same as HoS coat. Still better than nothing, but nowhere as good as a carapace modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 Heat: 0.75 - type: entity @@ -235,6 +235,13 @@ sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOS + - type: Armor # DeltaV - adds resists to coat. As good as Cap's, but I don't know why you'd wear this over a trench coat + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 + Heat: 0.75 - type: entity parent: ClothingOuterWinterCoatToggleable diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 935779c2c73..0ec4e110232 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -167,12 +167,12 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtHoS name: head of security's jumpskirt - description: It's bright red and rather crisp, much like security's victims tend to be. Its sturdy fabric provides minor protection from slash and pierce damage. + description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/hos.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/hos.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite - type: entity parent: ClothingUniformSkirtBase @@ -341,23 +341,23 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSec name: security jumpskirt - description: A jumpskirt made of strong material, providing robust protection. + description: A charcoal skirt and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/security.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/security.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtWarden - name: warden's uniform - description: A formal security suit for officers complete with Nanotrasen belt buckle. + name: warden's jumpskirt # DeltaV - renamed to mirror other security uniforms + description: Red shirt on a charcoal skirt, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/warden.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/warden.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite # COLORS @@ -776,12 +776,12 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSecGrey name: grey security jumpskirt - description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. + description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi # DeltaV - resprite - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index eb52b3b10c8..7460d6140cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -298,12 +298,12 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitHoS name: head of security's jumpsuit - description: It's bright red and rather crisp, much like security's victims tend to be. + description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase @@ -320,23 +320,23 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitHoSBlue name: head of security's blue jumpsuit - description: A blue jumpsuit of Head of Security. + description: A blue Station Security shirt with charcoal trousers. Features gold emblems and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoSGrey name: head of security's grey jumpsuit - description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger. + description: A grey Station Security shirt with charcoal trousers. Stands out with red highlights, gold emblems, and commander's epaulettes. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase @@ -516,45 +516,45 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSec name: security jumpsuit - description: A jumpsuit made of strong material, providing robust protection. + description: Charcoal trousers and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/security.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/security.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSecBlue - name: blue shirt and tie - description: I'm a little busy right now, Calhoun. + name: blue security jumpsuit # DeltaV - renamed to mirror other security uniforms + description: A cool blue shirt over charcoal trousers, for the calm and collected security officer. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSecGrey name: grey security jumpsuit - description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. + description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitWarden - name: warden's uniform - description: A formal security suit for officers complete with Nanotrasen belt buckle. + name: warden's jumpsuit # DeltaV - renamed to mirror other security uniforms + description: Red shirt on charcoal trousers, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/warden.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/warden.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite # COLORS diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 3884e81d728..77b56560795 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -16,6 +16,7 @@ - ClothingHeadHelmetTemplar - ClothingNeckCloakTrans - ClothingNeckCloakAdmin + - ClothingNeckCloakBoat # DeltaV - adds boat cloak to maints spawner. Makes more sense than admin cloak o.o - ClothingNeckCloakMoth - ClothingNeckCloakGoliathCloak - ToySkeleton diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 7bfd914d94f..c37ff76b681 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -67,12 +67,12 @@ name: viper parent: BaseWeaponPistol id: WeaponPistolViper - description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. + description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo. # DeltaV - Changed description after removing full-auto receiver. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi availableModes: - - FullAuto +# - FullAuto # DeltaV - Removed auto-Viper - SemiAuto - type: ItemSlots slots: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 5c5972d839b..69572659d73 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -139,18 +139,19 @@ name: energy cutlass parent: EnergySword id: EnergyCutlass - description: An exotic energy weapon. + description: An exotic energy weapon, brutal blade crackling with crudely harnessed plasma. #DeltaV - nicer description. components: - type: EnergySword secret: true litDamageBonus: - types: - Slash: 7.5 - Heat: 7.5 - Blunt: -1 + types: # DeltaV - modified e-cutlass to be superior to e-sword + Slash: 17 + Heat: 17 + Structural: 8.5 + Blunt: -6 litDisarmMalus: 0.6 - type: Sprite - sprite: Objects/Weapons/Melee/e_cutlass.rsi + sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi # DeltaV layers: - state: e_cutlass - state: e_cutlass_blade @@ -158,9 +159,16 @@ visible: false shader: unshaded map: [ "blade" ] + - type: MeleeWeapon # DeltaV - reduced attack rate of e-cutlass; slower, more brutal swings + attackRate: 0.75 + soundHit: + path: /Audio/Weapons/eblade1.ogg + damage: + types: + Blunt: 6 - type: Item size: 5 - sprite: Objects/Weapons/Melee/e_cutlass.rsi + sprite: DeltaV/Objects/Weapons/Melee/e_cutlass.rsi #DeltaV - type: entity name: Double Bladed Energy Sword diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 2e733cf658a..18bdb38dfa2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -38,7 +38,7 @@ tags: - Katana - type: Sprite - sprite: Objects/Weapons/Melee/katana.rsi + sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV state: icon - type: MeleeWeapon damage: @@ -48,7 +48,7 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: 15 - sprite: Objects/Weapons/Melee/katana.rsi + sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV - type: DisarmMalus - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ab0062c9eda..c43a539a4e5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -558,6 +558,8 @@ - MagazineBoxLightRifle - SpeedLoaderMagnum - SpeedLoaderSpecial # DeltaV - .38 Special revolver + - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour + - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour - TargetHuman - TargetSyndicate - TargetClown @@ -774,6 +776,10 @@ - ClothingUniformJumpskirtHoP - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS + - ClothingUniformJumpsuitHoSBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtHoSBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpsuitHoSGrey # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtHoSGrey # DeltaV - alternate sec uniforms - ClothingUniformJumpsuitHoSAlt - ClothingUniformJumpskirtHoSAlt - ClothingUniformJumpsuitHydroponics @@ -806,10 +812,18 @@ - ClothingUniformJumpskirtScientist - ClothingUniformJumpsuitSec - ClothingUniformJumpskirtSec + - ClothingUniformJumpsuitSecBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtSecBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpsuitSecGrey # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtSecGrey # DeltaV - alternate sec uniforms - ClothingUniformJumpsuitBrigmedic - ClothingUniformJumpskirtBrigmedic - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden + - ClothingUniformJumpsuitWardenBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtWardenBlue # DeltaV - alternate sec uniforms + - ClothingUniformJumpsuitWardenGrey # DeltaV - alternate sec uniforms + - ClothingUniformJumpskirtWardenGrey # DeltaV - alternate sec uniforms - ClothingOuterWinterCap - ClothingOuterWinterCE - ClothingOuterWinterCMO @@ -844,6 +858,7 @@ - ClothingOuterWinterSci - ClothingOuterWinterRobo - ClothingOuterWinterSec + - ClothingOuterStasecSweater # DeltaV - added stasec sweater to uniform printer. - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 40d643f9124..65eb84a5f43 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -848,7 +848,7 @@ parent: PosterBase id: PosterLegitEnlist name: "Enlist" - description: "Enlist in the Nanotrasen Deathsquadron reserves today!" + description: "Enlist in the NanoTrasen ERT reserves today!" # DeltaV - expunged blatant reference to Division of Asset Protection death squads components: - type: Sprite state: poster29_legit diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml index e606b1c1816..b6f323e6bc1 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml @@ -13,54 +13,54 @@ - state: shellslug - type: entity - name: box of .25 caseless Universal magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRifle - description: A box full of .25 caseless magazines. + name: box of .45 magnum Universal magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnum + description: A box full of .45 magnum magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalMagnum amount: 6 -## hv is kill +## hv is kill || why??? :( this is big sadd ## no #- type: entity -# name: box of .25 caseless Universal (high-velocity) magazines -# parent: BoxCardboard -# id: BoxMagazineUniversalCaselessRifleHighVelocity -# description: A box full of .25 caseless high-velocity magazines. +# name: box of .45 magnum Universal (high-velocity) magazines +# parent: BoxMagazine +# id: BoxMagazineUniversalMagnumHighVelocity +# description: A box full of .45 magnum high-velocity magazines. # components: # - type: StorageFill # contents: -# - id: MagazineUniversalCaselessRifleHighVelocity +# - id: MagazineUniversalMagnumHighVelocity # amount: 6 - type: entity - name: box of .25 caseless Universal (practice) magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRiflePractice - description: A box full of .25 caseless practice magazines. + name: box of .45 magnum Universal (practice) magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnumPractice + description: A box full of .45 magnum practice magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRiflePractice + - id: MagazineUniversalMagnumPractice amount: 6 - type: entity - name: box of .25 caseless Universal (rubber) magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRifleRubber - description: A box full of .25 caseless rubber magazines. + name: box of .45 magnum Universal (rubber) magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnumRubber + description: A box full of .45 magnum rubber magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRifleRubber + - id: MagazineUniversalMagnumRubber amount: 6 - type: entity name: box of .30 rifle speed loaders - parent: BoxCardboard + parent: BoxMagazine id: BoxSpeedLoaderLightRifle description: A box full of .30 rifle speed loaders. components: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml similarity index 64% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml rename to Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml index d5fe4d9ef11..9393d9cea15 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml @@ -1,22 +1,22 @@ - type: entity - id: BaseMagazineUniversalCaselessRifle - name: "Universal magazine (.25 caseless)" - parent: BaseMagazineCaselessRifle + id: BaseMagazineUniversalMagnum + name: "Universal magazine (.45 magnum)" + parent: BaseMagazinePistol abstract: true components: - type: Tag tags: - - MagazineUniversalCaselessRifle + - MagazineUniversalMagnum - type: BallisticAmmoProvider whitelist: tags: - - CartridgeCaselessRifle - proto: CartridgeCaselessRifle + - CartridgeMagnum + proto: CartridgeMagnum capacity: 12 - type: Item size: 5 - type: Sprite - sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi + sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -31,12 +31,12 @@ # Magazines for the Universal Pistol - type: entity - id: MagazineUniversalCaselessRifle - name: "Universal magazine (.25 caseless)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnum + name: "Universal magazine (.45 magnum)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle + proto: CartridgeMagnum capacity: 12 - type: Sprite layers: @@ -50,12 +50,12 @@ zeroVisible: false - type: entity - id: MagazineUniversalCaselessRiflePractice - name: "Universal magazine (.25 caseless practice)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnumPractice + name: "Universal magazine (.45 magnum practice)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRiflePractice + proto: CartridgeMagnumPractice capacity: 12 - type: Sprite layers: @@ -69,12 +69,12 @@ zeroVisible: false - type: entity - id: MagazineUniversalCaselessRifleRubber - name: "Universal magazine (.25 caseless rubber)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnumRubber + name: "Universal magazine (.45 magnum rubber)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber + proto: CartridgeMagnumRubber capacity: 12 - type: Sprite layers: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index d7be301c2bc..e6343053000 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -2,7 +2,7 @@ name: mk 32 "Universal" parent: BaseWeaponPistol id: WeaponPistolUniversal - description: An expensive and robust pistol with decent offensive capabilities. Uses .25 caseless ammo. + description: An expensive and robust pistol with decent offensive capabilities. Uses .45 magnum ammo. components: - type: Sprite sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi @@ -15,26 +15,28 @@ sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi - type: Gun fireRate: 3 + availableModes: + - SemiAuto soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + path: /Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg - type: ItemSlots slots: gun_magazine: name: Magazine - startingItem: MagazineUniversalCaselessRifle + startingItem: MagazineUniversalMagnum insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazineUniversalCaselessRifle + - MagazineUniversalMagnum gun_chamber: name: Chamber - startingItem: CartridgeCaselessRifle + startingItem: CartridgeMagnum priority: 1 whitelist: tags: - - CartridgeCaselessRifle + - CartridgeMagnum - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml index deae9f0f0f9..3fe7816769d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml @@ -4,10 +4,14 @@ id: Wakizashi description: A short, multi-purpose sword of plasteel construction. components: - - type: Sharp - type: Tag tags: - Katana + - type: Sharp + - type: Utensil + types: + - Knife + - type: ItemCooldown - type: Sprite sprite: Nyanotrasen/Objects/Weapons/Melee/wakizashi.rsi state: icon @@ -15,17 +19,15 @@ attackRate: 2 damage: types: - Slash: 8 -# - type: MeleeBloodletter -# bloodReduction: -# types: -# Slash: 8.0 + Slash: 12 + soundHit: + path: /Audio/Weapons/bladeslice.ogg - type: Item size: 10 sprite: Nyanotrasen/Objects/Weapons/Melee/wakizashi.rsi - - type: DisarmMalus - type: Tool qualities: - Slicing useSound: path: /Audio/Items/Culinary/chop.ogg + - type: DisarmMalus diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml index 97360dc9c5a..5832a590d9a 100644 --- a/Resources/Prototypes/Nyanotrasen/tags.yml +++ b/Resources/Prototypes/Nyanotrasen/tags.yml @@ -2,7 +2,7 @@ id: MothroachHide - type: Tag - id: MagazineUniversalCaselessRifle + id: MagazineUniversalMagnum - type: Tag id: BluespaceCrystal diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6f96d00a791 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/icon.png new file mode 100644 index 00000000000..bf904b3e5f6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-left.png new file mode 100644 index 00000000000..c1f9508af53 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-right.png new file mode 100644 index 00000000000..b3931c2ecea Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/meta.json new file mode 100644 index 00000000000..945610b118b --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png new file mode 100644 index 00000000000..3a79a72667c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png new file mode 100644 index 00000000000..085cb908347 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json new file mode 100644 index 00000000000..8aa69e9e04f --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..0beb64b9d90 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png new file mode 100644 index 00000000000..3932fed95c1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png new file mode 100644 index 00000000000..bc3b5a066ed Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png new file mode 100644 index 00000000000..48103c1af3f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json new file mode 100644 index 00000000000..370f801e3cf --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.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/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.", + "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/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..87c7273336c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png new file mode 100644 index 00000000000..0f7808e8871 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png new file mode 100644 index 00000000000..0acc923ee13 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png new file mode 100644 index 00000000000..85deeda2cda Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json new file mode 100644 index 00000000000..1253f8b4e63 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "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/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..a776184398a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png new file mode 100644 index 00000000000..ccec2493f64 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png new file mode 100644 index 00000000000..cc430b01ed5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png new file mode 100644 index 00000000000..8639699a82e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json new file mode 100644 index 00000000000..decfcb78480 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "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/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png index 2da42ddd1be..c59e4ce0bd9 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png index 15871552f39..1f3f96a0705 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png index d43a2866d70..062ee545378 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png index d6dbe3d5177..d5f80f2a8cb 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..dfa53d57a3d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png new file mode 100644 index 00000000000..1140944904c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png new file mode 100644 index 00000000000..910974d1025 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png new file mode 100644 index 00000000000..734477e1754 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9fa77c22018 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png new file mode 100644 index 00000000000..9c10d722bab Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..54379cb577c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..2eb43fecd5c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..cded3b544f9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png new file mode 100644 index 00000000000..ebf44dae26f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..0cd009d25f6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..f936e28a6cf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..8d5f5d2d9e6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png new file mode 100644 index 00000000000..681e47c62bd Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png new file mode 100644 index 00000000000..c9213c5388c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png new file mode 100644 index 00000000000..89cc55c8c43 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e225a5df862 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png new file mode 100644 index 00000000000..50daf885dc3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..e4c1a71eeda Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..168f32ed57c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..365a41e35aa Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png new file mode 100644 index 00000000000..9893769efb3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..152aa2a391a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..7a7e3311294 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..546f95d7e37 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png new file mode 100644 index 00000000000..a435f894690 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png new file mode 100644 index 00000000000..2b084b56b57 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png new file mode 100644 index 00000000000..7035268ff1a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b8dbbcbba6a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png new file mode 100644 index 00000000000..da9549e34ad Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..94f2e3b401e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..127f5ec145c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0e0e7571fca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png new file mode 100644 index 00000000000..2c3fd7e056e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..22505c9dd0e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..e0ff5ea384f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png index 8da209d0a43..077f909e403 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png index 1e9dd9e59c0..ab2ee3f62be 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png index fef04a2507e..08143c0b602 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png index 34c23dac6db..e1d0173a8b8 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0499974a4bc Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png new file mode 100644 index 00000000000..48df939a994 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png new file mode 100644 index 00000000000..910974d1025 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png new file mode 100644 index 00000000000..734477e1754 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b9283e1297d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png new file mode 100644 index 00000000000..fc8b73a6b74 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..54379cb577c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..2eb43fecd5c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..408a7bdffbf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png new file mode 100644 index 00000000000..0f041718a34 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..0cd009d25f6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..f936e28a6cf Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..d6ac1f9202e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png new file mode 100644 index 00000000000..b75fa776f90 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png new file mode 100644 index 00000000000..c9213c5388c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png new file mode 100644 index 00000000000..89cc55c8c43 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3607650447d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png new file mode 100644 index 00000000000..ff21f9320fb Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..e4c1a71eeda Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..168f32ed57c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..8d639cb7385 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png new file mode 100644 index 00000000000..177f7aa0d91 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..152aa2a391a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..7a7e3311294 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..748d3b4e271 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png new file mode 100644 index 00000000000..5fc89962f54 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png new file mode 100644 index 00000000000..2b084b56b57 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png new file mode 100644 index 00000000000..7035268ff1a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b01d10e256d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png new file mode 100644 index 00000000000..48241497281 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png new file mode 100644 index 00000000000..94f2e3b401e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png new file mode 100644 index 00000000000..127f5ec145c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..200be4bb0b3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png new file mode 100644 index 00000000000..a555f3e4b94 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png new file mode 100644 index 00000000000..22505c9dd0e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png new file mode 100644 index 00000000000..e0ff5ea384f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json new file mode 100644 index 00000000000..839e5d52bc9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png new file mode 100644 index 00000000000..81d70abe95b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png new file mode 100644 index 00000000000..e4d9a014865 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png new file mode 100644 index 00000000000..52666b6192e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png new file mode 100644 index 00000000000..8cfeb0987a5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png new file mode 100644 index 00000000000..7e1df839ce9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png new file mode 100644 index 00000000000..d0e8068dae6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png new file mode 100644 index 00000000000..a225b095d1f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json new file mode 100644 index 00000000000..984eb3b8680 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png index 4f2f7d4e2e0..082e8463ea0 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png index ede60284b49..e306212f39a 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png index ede60284b49..575ea2ad789 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png new file mode 100644 index 00000000000..ad3b01ba9c0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png new file mode 100644 index 00000000000..119a03725ee Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..58563f18220 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png new file mode 100644 index 00000000000..7b7baaad153 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png new file mode 100644 index 00000000000..5dfb70b2c49 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png new file mode 100644 index 00000000000..50cc43898d2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png new file mode 100644 index 00000000000..50feca5bb6e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json new file mode 100644 index 00000000000..013ebbce3f2 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png new file mode 100644 index 00000000000..6f6e6c28535 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png new file mode 100644 index 00000000000..23958df2463 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..1c90f37025c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png new file mode 100644 index 00000000000..14c83c8517c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png new file mode 100644 index 00000000000..8f1a6d24846 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png new file mode 100644 index 00000000000..6f4bc99c8a3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png new file mode 100644 index 00000000000..2b3836a5e80 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json new file mode 100644 index 00000000000..f3e24a3ea29 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png new file mode 100644 index 00000000000..e242e459dcd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png new file mode 100644 index 00000000000..1552153581d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..6276d5e3ff7 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png new file mode 100644 index 00000000000..6b1019f406b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png new file mode 100644 index 00000000000..6b9d8a59f4b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png new file mode 100644 index 00000000000..828a439d310 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png new file mode 100644 index 00000000000..148c42717e1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json new file mode 100644 index 00000000000..c6650f60b97 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png index a570e87127e..c73c70dd263 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png index 3a0fe358056..54cec2d21a7 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json index b8817de9102..02720779bb2 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json @@ -13,15 +13,15 @@ { "name": "base" }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, { "name": "mag-1" }, + { + "name": "bolt-open" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png new file mode 100644 index 00000000000..fde65c44807 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png new file mode 100644 index 00000000000..4be18c6a3c6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/icon.png new file mode 100644 index 00000000000..11129ad0868 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..b6bce6190e0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png new file mode 100644 index 00000000000..d9ca2d301ee Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..b2700e932ac Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png new file mode 100644 index 00000000000..bd7d8749a1d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/meta.json new file mode 100644 index 00000000000..d6321812ff5 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi/meta.json @@ -0,0 +1,78 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "e_cutlass" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "e_cutlass_blade", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png new file mode 100644 index 00000000000..b572059f735 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png new file mode 100644 index 00000000000..5125d47e617 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.png new file mode 100644 index 00000000000..b2ab7b418aa Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json new file mode 100644 index 00000000000..2934026c5eb --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/equipped-BELT.png b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/equipped-BELT.png index 8f4743ca05b..cc75d749ed0 100644 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/equipped-BELT.png and b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre-equipped-BELT.png index 4b3a26fcfa3..2303506404f 100644 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre-equipped-BELT.png and b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre-equipped-BELT.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/base.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/base.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/base.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/high_velocity.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/high_velocity.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-1.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-1.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-1.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-10.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-10.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-10.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-10.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-11.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-11.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-11.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-11.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-2.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-2.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-2.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-3.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-3.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-3.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-4.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-4.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-4.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-5.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-5.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-5.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-6.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-6.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-6.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-6.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-7.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-7.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-7.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-7.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-8.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-8.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-8.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-8.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-9.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-9.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-9.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/mag-9.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/meta.json similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/meta.json rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/meta.json diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/practice.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/practice.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/practice.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red-icon.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/red-icon.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red-icon.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/red-icon.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/red.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/red.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/rubber.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/rubber.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/universal_mag.rsi/rubber.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png index 71dd8ffbe0c..12f701bc8e6 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png index 71dd8ffbe0c..6bea77d3b96 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png index 7597947ac84..60df7452cac 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png index e4cd2e3457d..470d4a2766f 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json index 8fd8383a363..5b927208315 100644 --- a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC0-1.0", "copyright": "Original work by TJohnson.", "size": { "x": 32, @@ -14,10 +14,10 @@ "name": "base" }, { - "name": "bolt-open" + "name": "mag-0" }, { - "name": "mag-0" + "name": "bolt-open" }, { "name": "inhand-left", diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index b0d8f4e6817..cbbe6e99490 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460. poster29_legit modified by TJohnson.", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png index e57d2b74fb3..62a6496e596 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png differ