Fancy guns. (#152)

This commit is contained in:
Pieter-Jan Briers
2019-03-23 15:04:14 +01:00
committed by GitHub
parent f0aec83be4
commit 0882435293
56 changed files with 957 additions and 54 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,7 @@
gun_empty.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/gun_empty.ogg
smg_magin.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/interact/smg_magin.ogg
smg_magout.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/interact/smg_magout.ogg
smg_empty_alarm.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/smg_empty_alarm.ogg
casingfall1.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall1.ogg
casingfall2.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall2.ogg
casingfall3.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall3.ogg

View File

@@ -286,13 +286,13 @@ entities:
pos: -2.015625,-3.859375
rot: -1.570796 rad
type: Transform
- type: GUNITEM
- type: smg_c20r
components:
- grid: 0
pos: -2.890625,-4.484375
rot: -1.570796 rad
type: Transform
- type: GUNITEM
- type: smg_c20r
components:
- grid: 0
pos: -1.984375,-4.484375

View File

@@ -55,6 +55,8 @@
- type: Eye
zoom: 0.5, 0.5
- type: CameraRecoil
- type: entity
id: MobObserver
name: Observer

View File

@@ -1,19 +0,0 @@
- type: entity
id: ProjectileBullet
name: ProjectileBullet
description: If you can see this you're dead!
components:
- type: Sprite
directional: false
texture: Objects/projectilebullet.png
#rotation: -180
- type: Icon
texture: Objects/projectilebullet.png
- type: BoundingBox
aabb: -0.2,-0.2,0.2,0.2
- type: Physics
edgeslide: false
- type: Projectile
- type: Collidable
hard: false

View File

@@ -19,28 +19,6 @@
sprite: Objects/laser_retro.rsi
prefix: 100
- type: entity
name: C-20r Sub Machine Gun
parent: BaseItem
id: GUNITEM
description: A rooty tooty point and shooty
components:
- type: Sprite
sprite: Objects/c20r.rsi
state: c20r-20
- type: Icon
sprite: Objects/c20r.rsi
state: c20r-20
- type: RangedWeapon
automatic: true
firerate: 8
- type: ProjectileWeapon
- type: Item
Size: 24
sprite: Objects/c20r.rsi
- type: entity
name: Spear
parent: BaseItem

View File

@@ -0,0 +1,50 @@
- type: entity
id: magazine_12mm
name: "12mm magazine"
parent: BaseItem
components:
- type: BallisticMagazine
caliber: A12mm
magazine: A12mm
capacity: 20
- type: Icon
sprite: Objects/items/magazine_12mm.rsi
state: 12mm-0
- type: Sprite
netsync: false
sprite: Objects/items/magazine_12mm.rsi
state: 12mm-0
- type: Appearance
visuals:
- type: BallisticMagazineVisualizer2D
base_state: 12mm
steps: 11
- type: entity
id: magazine_12mm_filled
name: "12mm magazine"
parent: magazine_12mm
components:
- type: BallisticMagazine
fill: ammo_casing_12mm
- type: Icon
state: 12mm-10
- type: Sprite
state: 12mm-10
- type: entity
id: ammo_casing_12mm
name: "12mm bullet"
parent: BaseItem
components:
- type: BallisticBullet
caliber: A12mm
projectile: ProjectileBullet
- type: Sprite
sprite: Objects/items/ammo_casing.rsi
state: s-casing
drawdepth: FloorObjects
- type: Icon
sprite: Objects/items/ammo_casing.rsi
state: s-casing

View File

@@ -0,0 +1,35 @@
- type: entity
name: C-20r Sub Machine Gun
parent: BaseItem
id: smg_c20r
description: A rooty tooty point and shooty.
components:
- type: Sprite
netsync: false
sprite: Objects/c20r.rsi
state: c20r-5
- type: Icon
sprite: Objects/c20r.rsi
state: c20r-5
- type: RangedWeapon
automatic: true
firerate: 8
- type: BallisticMagazineWeapon
caliber: A12mm
magazine: A12mm
default_magazine: magazine_12mm_filled
auto_eject_magazine: true
sound_auto_eject: /Audio/items/weapons/smg_empty_alarm.ogg
sound_magazine_in: /Audio/items/weapons/smg_magin.ogg
sound_magazine_out: /Audio/items/weapons/smg_magout.ogg
sound_empty: /Audio/items/weapons/gun_empty.ogg
- type: Appearance
visuals:
- type: BallisticMagazineWeaponVisualizer2D
base_state: c20r
steps: 6
- type: Item
Size: 24
sprite: Objects/c20r.rsi

View File

@@ -0,0 +1,19 @@
- type: entity
id: ProjectileBullet
name: ProjectileBullet
description: If you can see this you're dead!
components:
- type: Sprite
directional: false
texture: Objects/projectilebullet.png
#rotation: -180
- type: Icon
texture: Objects/projectilebullet.png
- type: BoundingBox
aabb: -0.2,-0.2,0.2,0.2
- type: Physics
edgeslide: false
- type: Projectile
- type: Collidable
hard: false

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 498 B

View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View File

Before

Width:  |  Height:  |  Size: 506 B

After

Width:  |  Height:  |  Size: 506 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 498 B

View File

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 490 B

View File

@@ -1 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "c20r", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-0", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-12", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-16", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-20", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-4", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-8", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "c20r", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-0", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-3", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-4", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-5", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-1", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-2", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi", "states": [{"name": "s-casing", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

View File

@@ -0,0 +1 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi", "states": [{"name": "12mm-0", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-1", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-10", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-2", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-3", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-4", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-5", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-6", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-7", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-8", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-9", "directions": 1, "delays": [[1.0]]}]}