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/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/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/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/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index ff098b32f90..4bf58557e62 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -64,12 +64,11 @@ 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. components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi availableModes: - - FullAuto - 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..5712031b6b7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -145,9 +145,10 @@ secret: true litDamageBonus: types: - Slash: 7.5 - Heat: 7.5 - Blunt: -1 + Slash: 17 + Heat: 17 + Structural: 8.5 + Blunt: -6 litDisarmMalus: 0.6 - type: Sprite sprite: Objects/Weapons/Melee/e_cutlass.rsi @@ -158,6 +159,13 @@ visible: false shader: unshaded map: [ "blade" ] + - type: MeleeWeapon + attackRate: 0.75 + soundHit: + path: /Audio/Weapons/eblade1.ogg + damage: + types: + Blunt: 6 - type: Item size: 5 sprite: Objects/Weapons/Melee/e_cutlass.rsi diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 40d643f9124..8bc8e2caf20 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!" 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 54% 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..fbaeb4df5b6 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: @@ -49,13 +49,33 @@ steps: 12 zeroVisible: false +## hv is kill apparently +#- type: entity +# id: MagazineUniversalMagnumHighVelocity +# name: "Universal magazine (.45 magnum high-velocity)" +# parent: BaseMagazineUniversalMagnum +# components: +# - type: BallisticAmmoProvider +# proto: CartridgeMagnumHighVelocity +# capacity: 12 +# - type: Sprite +# layers: +# - state: high_velocity +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-1 +# map: ["enum.GunVisualLayers.Mag"] +# - type: MagazineVisuals +# magState: mag +# steps: 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 +89,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..5fc1f4cdca2 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 @@ -16,25 +16,25 @@ - type: Gun fireRate: 3 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/tags.yml b/Resources/Prototypes/tags.yml index 61acbe2ba87..330dac73bc5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -689,6 +689,9 @@ - type: Tag id: MagazineShotgun +- type: Tag + id: MagazineUniversalMagnum + - type: Tag id: MagazineMagnumSubMachineGun 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/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/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png index a80f0ad0875..fde65c44807 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png index 35de91f6821..4be18c6a3c6 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/e_cutlass_blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/icon.png new file mode 100644 index 00000000000..11129ad0868 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png index 240fa8679aa..b6bce6190e0 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png index 9193c95765e..d9ca2d301ee 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png index 8163f8a8bae..b2700e932ac 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png index e9e8892e5b0..bd7d8749a1d 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json index 62bac1598d0..d6321812ff5 100644 --- a/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/e_cutlass.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14", + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "e_cutlass" }, diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png index 4a1b7d82cd2..b572059f735 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png index bcaee4ac97f..5125d47e617 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png index 8fd468ac648..b2ab7b418aa 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index b2c66cff5b2..2934026c5eb 100644 --- a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "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 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