Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Arsenal expansion #189

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions Resources/Audio/DeltaV/license.txt
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,43 @@
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: ItemSlots
slots:
gun_magazine:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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 has been used to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo.
components:
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
Expand Down Expand Up @@ -46,4 +46,130 @@
- type: Appearance
- type: Clothing
sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi


- 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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- 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:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
{
"name": "suppressor"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
{
"name": "mag-1"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
{
"name": "mag-0"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
Expand Down